From nobody Sat Apr 05 16:30:36 2025 X-Original-To: dev-commits-src-main@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 4ZVLYn5mLWz5sRF9; Sat, 05 Apr 2025 16:30:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZVLYn0085z3GSH; Sat, 05 Apr 2025 16:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743870637; 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=4ef+zbdNbqYHZjUyxM3lWivdwiXM9IIqcMJ5x5/HCIc=; b=ohfoy1wEJJUEisXkJ3nR7XHU5ACjRCLqdJ/KPbCcAX8RCvfyDgY6QJl444TC52TzFWFb7e nhHfy4i5Mj6td0Sgu9Eanv3Zfxe86SbYi3COro9jwNl8Tgvs2AIy0GD5mHR8jqM5lSzOos jSvxqXIiRYaJKJAgHoyV3GZNV15veyqtkoGZT0qN67w6zZK9ZCdvw7EcPiAM1UEL/Sc57t 5jdeKDLN2iG2cTcJ2RmSo59cJGhqm13uVWRvv9zbe9sQ6vgJK6gvvdSKapPuWlqzgWQgmP q8sohtZ6juijT3dxohRZiCanJcCv5xKbWyKAUeRJ+bebwCYx6PvyGzexuf7XbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743870637; a=rsa-sha256; cv=none; b=hncKvu6N9KOywmJrNYjMGbCi/7ieJiJ5T2s/FwU8wJJ0MAhRWr+Cdaq4DFzwr0WAQAdo9i 0t/e246AmeGKxwtNCUYHferC1YA9vj1GIqCILnneRPPSYeDRNMCtX2XR6OahZaAtMze5r8 2H3FLS7VITo88rns2NUR6wZfYYYgzdsoJ++U2OFDXIwMc/MvDXzrnXaSaMnDLhzUsI0lVV 2zyvn0g5LEis/G0u7pFKTLLRJEfnOV9RjLCu+QDpZ8fpn/3EMHEfhZhLiOvFGInkxQW9g1 TV54GO/prKai2cXTiOo3cOPLf6GAR6QeEUUFhI2Grm1vq2G72vPETPXlFzJ0CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743870637; 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=4ef+zbdNbqYHZjUyxM3lWivdwiXM9IIqcMJ5x5/HCIc=; b=ao1M0+En0kZ5v+eTb4TEkmtl79bn2OEd/o3fObPdDbe8+HIr70AboQqk4PwrompCAnrXB+ WA6pNXRU6nTMczRB/CPNfYNmplAcnwby6yim5354zA+4CQVrLXJA9iL52dn9rp//DZQ7Fs rRGxkD3a1s5G1iDzjb+Ep+S0dkUiQkuYMDsmywDvYvAi7Nt9hfSlx681XzVxrJ6DfwA7e4 MwlVjxNey9DCEE+HD06RAMZx4BSiVRt9eqyRD/MatVnX3sRZXY4Anr7dfNL1iRIUVEH75x roJ4pVtTu9A00LB4MNAsL4F8vVdb5zYAvUbSifsaJojrfrowZuS8rCLLFAT1og== 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 4ZVLYm6hsRz7XP; Sat, 05 Apr 2025 16:30:36 +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 535GUa90077880; Sat, 5 Apr 2025 16:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 535GUaaM077877; Sat, 5 Apr 2025 16:30:36 GMT (envelope-from git) Date: Sat, 5 Apr 2025 16:30:36 GMT Message-Id: <202504051630.535GUaaM077877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d35c4cfad580 - main - sysctl: Panic on OID reuse List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d35c4cfad5800b15ab730af5246df0366f2be558 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d35c4cfad5800b15ab730af5246df0366f2be558 commit d35c4cfad5800b15ab730af5246df0366f2be558 Author: Mark Johnston AuthorDate: 2025-04-05 16:22:20 +0000 Commit: Mark Johnston CommitDate: 2025-04-05 16:22:20 +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 --- 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 8cf8e7b19c89..46226cc31980 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -516,7 +516,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 */