From nobody Tue May 06 14:16:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsL6F2m3hz5tsjs; Tue, 06 May 2025 14:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsL6F15XWz48jr; Tue, 06 May 2025 14:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/o1cSnNAneEufTiWy1nVxV1XwZ54z43QNwyTF8nwBk=; b=vPzG4KeLWl/AXigj8FlG7HXBDNtRT4G6qvdcnmdrN3IAaNvnqSjgoUrR4x5DpUeIVBz4QY 9dLNZdHzflFvJUlobPbX0FJlvZ2X8L0g8Hjywc/4pPaVdozi9w+T6BW4HMWC43TBJd5ZzE plmkFH+QI02Xs1guh6W0vEswnF1buN/cISIijbrr1xPCVw218xgZDhmnISxZTNCkU1AZfk bp6tY8103AshMYnDZ+aqZrpeVqZeSW9ygQXugu6QPu5Hj227A7sX7r4e3dtNjsrbdt0O9w Qr0TeWlIe5NJaKKclLZKUzyNsxoVpZgNnzktBK31Z+KUTxoXGGZnhQIZD2X+cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746540965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/o1cSnNAneEufTiWy1nVxV1XwZ54z43QNwyTF8nwBk=; b=PvhAN9tkSr3Yfw8lEXAhv3qtU+/OzWax1XjDOEOMPL/IDHcvV8kXFPDkfrTkq5sUvxPuEe qAyzF/hsPK5V3uQdSj/Um8JHwFLQJZcJBUc5KJaoekj87P8ongRVbLL30PV0m63gAvisVt qlgBTKHwjR5jKvWLBG977N72WG5xq3AchIjVV9iUlnQmZN6zZOaz+CEIJ+r1Pc5plxyVpu OECuRwML6Lj/PbPCUkzazBwZedVrUOjkIlfdOxLd+hUqMr1f6OUreQzHU7bexrl5RZ2Pu3 JKN/KfjAo4SKpTUosF5rM+Gkw+PO4ASvU9gYDqf9GC6vo3t26ktmvam4Q/jSag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746540965; a=rsa-sha256; cv=none; b=BsUt8L2+LZWcKIQLZp0wb4FGztW2Vyp0lHYQuAMYkjTNbtjM21lgNmZqSu/pRmtsFZw+zn uxOABQdmHP36ysmCQQMmBh/2ZFUsW2Zdaztz5IjM76l/rTVPAW4g+BBVz7DEGwZjs0MUHj OwSZhRjlb4poIlGXb5xXSjZ21LHr3AZulfltcIoAwG8t+rup2BNfc0lDOWRMH1tzj6pY18 Ayp/0DK2CAFD029obRlxwlujFKDUm4MJ4YtEw2knkMjPCQEFAvefx8m8RKeZsnImGOGOnL IYXGvz7FJYS0BD+a+edBfrXVkzEY74p7iaoRRNSq51b8hRQSFykkLEytxE8pwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsL6F0jRKz1317; Tue, 06 May 2025 14:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546EG5bm051204; Tue, 6 May 2025 14:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546EG5Xf051201; Tue, 6 May 2025 14:16:05 GMT (envelope-from git) Date: Tue, 6 May 2025 14:16:05 GMT Message-Id: <202505061416.546EG5Xf051201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4f3ce62ff7ef - stable/14 - sysctl: Panic on OID reuse List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f3ce62ff7ef930eddaf3c7de59195092eee3e00 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f3ce62ff7ef930eddaf3c7de59195092eee3e00 commit 4f3ce62ff7ef930eddaf3c7de59195092eee3e00 Author: Mark Johnston AuthorDate: 2025-04-05 16:22:20 +0000 Commit: Mark Johnston CommitDate: 2025-05-06 14:15:38 +0000 sysctl: Panic on OID reuse In CheriBSD we had a conflict in the KERN_PROC OID space and didn't notice for some time. Let's panic instead to make such conflicts easier to detect. Note that this doesn't affect conflicts arising from name collisions in OID_AUTO sysctls, which happen sometimes due to driver bugs. Reviewed by: brooks, kib, jhb MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D49351 (cherry picked from commit d35c4cfad5800b15ab730af5246df0366f2be558) --- sys/kern/kern_sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index b9ca0e7e5041..479792b4fff1 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -518,7 +518,7 @@ sysctl_register_oid(struct sysctl_oid *oidp) /* check for non-auto OID number collision */ if (oidp->oid_number >= 0 && oidp->oid_number < CTL_AUTO_START && oid_number >= CTL_AUTO_START) { - printf("sysctl: OID number(%d) is already in use for '%s'\n", + panic("sysctl: OID number(%d) is already in use for '%s'\n", oidp->oid_number, oidp->oid_name); } /* update the OID number, if any */