From nobody Thu May 2 20:01:00 2024 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 4VVlDY3k2tz5JxDC; Thu, 2 May 2024 20:01:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVlDX6qNXz4r9G; Thu, 2 May 2024 20:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714680061; 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=8Dbv0zbfe0WPyoiA3C40HabXO1bW+jBQETDxvdvaa0w=; b=p3q+OJehitEFn4gyHgTsu5kr9/37xkLpy5XzQXSqLHxBRTUauro7LELuNexUt/gnhUK7hh KzU/0/IWV19X+LBrWJH4wWGFVUjmJEqyzCcGquoMYBuIo0Zx5sPbXjyX18DkI8j2tLsa4c 5oAYCmiXdTeYllowmRfad07J8SX6+zVagctW4qQi0rSW4RGwQ2ZLHl7s3u5RWc9Mxsbub5 /7xfXDcZ3dj7kgc4ATyrPaIPXSSVB2nxl9ibggRvoo7P+l+q/ocXXE3E1xhRfw7f4nXWmg 3Wu1MXr9yJ23GxuWVjfVDM3r/zTOdrhcazdBJTgCUTpOHT4P4f5gaiUzyH0/tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714680061; a=rsa-sha256; cv=none; b=V4BPx7QzDVhA1kH6v/D4Zmzj1erHrCzH6nomW5oYdjYQke7hPxzFv64gbKiowUIJOfd4NA AwuRybfvcHNp3Zv7SIXEY5B6ROOo+VuSH/DftBeZMU+scUDWKVxy8mDkUpZ+UTt8/QGUgr 180wu6OJa+v6NF3+OaajyCXvVV4QiYxMA4K7V3eYXmaOv203twue1FN6Ssh+R7/ssZScPe mlAaZuGTW0h4yrz0yVRUIRC97hEvtfFJtRO2v8UDVumPV+NvHkwTFq8+hfbsyb1ATfTRru SJET+rPX/wZ5Y7s0rNFf2UX7fmjZA6nVs9tqryRjZhPQpCD3B633IRdz1L8f6A== 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=1714680061; 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=8Dbv0zbfe0WPyoiA3C40HabXO1bW+jBQETDxvdvaa0w=; b=wQi7mV41tnyunAxerZ5I99+lyYBCajgRlce1u6pcP8nppduyRw9U70wbdqr15D3st/IaVz cej4Jd00RbukkAdzP4419u3Roj+wY94iKrQgZ/vZr14px+cP/CIF2T/FL8nrAQQSYYAm7k 7R2JydQ1MlIdHBYkHC7SFcG9ZMofOjx01/1daE8JYDHpxHzFFS2j2ogXX2I9UBOm2Uckj6 uP75XVv/YYNxtwL2cG2ljNQktkth0dUW+639cU2dUY70TO3Y6O3UP9Kv9fcPV8ol0928kf 5n64dMdJrbr2xzdDLi9lNIW7N9JDc+QdkcKn/8G8O7r4D6HWdS7XOGNciWUsyw== 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 4VVlDX6QjKzGkP; Thu, 2 May 2024 20:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 442K10AW048999; Thu, 2 May 2024 20:01:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442K10Qw048996; Thu, 2 May 2024 20:01:00 GMT (envelope-from git) Date: Thu, 2 May 2024 20:01:00 GMT Message-Id: <202405022001.442K10Qw048996@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: d5eae57088f5 - main - sysctl: Make sysctl_ctx_free() a bit safer 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/main X-Git-Reftype: branch X-Git-Commit: d5eae57088f5eec5df49fea8e8623521f596db68 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d5eae57088f5eec5df49fea8e8623521f596db68 commit d5eae57088f5eec5df49fea8e8623521f596db68 Author: Mark Johnston AuthorDate: 2024-05-01 11:57:56 +0000 Commit: Mark Johnston CommitDate: 2024-05-02 19:42:28 +0000 sysctl: Make sysctl_ctx_free() a bit safer Clear the list before returning so that sysctl_ctx_free() can be called more than once on the same list without side effects. This simplifies error handling in drivers; previously, drivers would have to be careful to call sysctl_ctx_free() at most once to avoid a use-after-free. While here, use TAILQ_FOREACH_SAFE in the loop which unregisters OIDs. Reviewed by: thj, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45041 --- sys/kern/kern_sysctl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index f714f78cf4da..e139d9c39181 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -651,17 +651,15 @@ sysctl_ctx_free(struct sysctl_ctx_list *clist) return(EBUSY); } /* Now really delete the entries */ - e = TAILQ_FIRST(clist); - while (e != NULL) { - e1 = TAILQ_NEXT(e, link); + TAILQ_FOREACH_SAFE(e, clist, link, e1) { error = sysctl_remove_oid_locked(e->entry, 1, 0); if (error) panic("sysctl_remove_oid: corrupt tree, entry: %s", e->entry->oid_name); free(e, M_SYSCTLOID); - e = e1; } SYSCTL_WUNLOCK(); + TAILQ_INIT(clist); return (error); }