From nobody Mon Jul 27 22:32:45 2026 X-Original-To: dev-commits-src-branches@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 4h8Cz23vySz6lxmL for ; Mon, 27 Jul 2026 22:32:46 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8Cz16txDz3CVt for ; Mon, 27 Jul 2026 22:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785191566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpu5Hnw/nNPdx1mMBgUvhS3He1QINIKxCJtI4HZ4LWE=; b=BsqKqy89+U+rUD22+RyAxClHGcDxQWTZbnZJzY7wLOV2eSXBWBfRh86F5KCUrE6J+phq+l Ip8TgIwz3/i/j9le8cVKkJ1DhH0Dt3cwA7rY82weHhREu3q33IatcicAr36+z3ZZDJOcSb o2BtnXYCF/lE16vTD+2JIKHgAi1/zmF5oQeYdTC8DzX/CU+d34/k8N/WeNiDunwXiWQbpE 8JvRxRy3LEiGa+8w1E1orfc5XChtCZ5GQt6toZZ/V8R/AJ0a7CKS6e0POCzb8aHe+G6PeS 0w+JRfC5YPw2BD9UOkmgOH+KS+87zdQmS6BtOW22w0s7UIV66VbxAykE1REMVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785191566; a=rsa-sha256; cv=none; b=P6dKMZk9bx+ftGxAdmJmZ06acd6IpR4fYxlNfovkdoWuM+IhOXf7JdTOMzbN3/K4LDhuY2 QkwZcjP9WuqIZJ0szDH92SaVZHxJzOVZDdy48VcnPBaWg0LVgQarqRGtgx04UBYwde5Liv GfUrwY1UmIqGHlG/2bkTrOktb9s42OwRM94pdLqPrjeDW3f2yKRFiK/rindDk5I8nhUUbp 8sNREmQhMuO/ybrQejc574sstWP0okGeDpnuzdxby4drfCjMIHn1KhP85PFGaApVvOZaw0 E9L0WzAiRzrFTikvl1EvazZK/4QOxWFQIlgiaiuOeedWQf1ysEjUO6LcPwyPDg== 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=1785191566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpu5Hnw/nNPdx1mMBgUvhS3He1QINIKxCJtI4HZ4LWE=; b=t3zD5xEaeM7GGtcT2tjlaUVtIjrbT3htafkxb4LtzT3n+Rr5399fQX5ffrRN26BaLNhJ4l KNBOyefgexl2Zxl4L0dVw2vOH6rvY/7VjZituSlCNovpyVIyWiuCVo5RQPgemCdxN2TeMI h0TOocgLR1TIKNgnr+lLp6hJD3k5I1DjlntDpPSjjvYCSsjgzxVc4r9+2iTafQndHyMDjd b4DLzUEdw11zHroJGV/ogmavomd0fKZ1Pvy/MVn8XnWKnQqoeBuP+lDeYWTziF7bwFkDuG hGEHcs8eR2Xf41HVSB5g6vzFEu/OCltKBDHtq72u6jCqh3PpOjorCSkLtBo+KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8Cz15ygsz1Qks for ; Mon, 27 Jul 2026 22:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 22:32:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Mark Johnston Subject: git: b4bd57d76563 - stable/14 - sysctl(9): Booleans: Fix old value length discovery List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: b4bd57d765632abdc770ed1f7089624a9cfa666e Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 22:32:45 +0000 Message-Id: <6a67dc8d.258ac.34a326ab@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4bd57d765632abdc770ed1f7089624a9cfa666e commit b4bd57d765632abdc770ed1f7089624a9cfa666e Author: Olivier Certner AuthorDate: 2026-02-03 22:25:46 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 22:32:00 +0000 sysctl(9): Booleans: Fix old value length discovery When calling sysctl(3) with a null 'oldp', i.e., length discovery mode, 'oldix' can be equal to 'oldlen', and we should not fail. More generally, let SYSCTL_OUT() and SYSCTL_IN() handle corner cases, simply removing the comparisons between 'oldidx' and 'oldlen' and 'newidx' and 'newlen' done by hand as the test just after is an equality that does not require to know if 'idx' is smaller than 'len'. PR: 292917 Reported by: cy Fixes: 406da392ef8d ("sysctl(9): Booleans: Accept integers to ease knob conversion") Sponsored by: The FreeBSD Foundation (cherry picked from commit 895e1c6567d9561c86f8d20b47e924911bce989e) --- sys/kern/kern_sysctl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index f65e8506abd8..b0201a6fc3e0 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1537,8 +1537,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) * the output buffer, we assume that the caller expected an 'int' * instead of a 'uint8_t'. */ - if (req->oldidx >= req->oldlen) - return (ENOMEM); if (req->oldlen - req->oldidx == sizeof(int)) { int temp_int = temp; @@ -1555,8 +1553,6 @@ sysctl_handle_bool(SYSCTL_HANDLER_ARGS) * Conversely, if the input buffer has exactly 4 bytes to read, * use them all to produce a bool. */ - if (req->newidx >= req->newlen) - return (ENOMEM); if (req->newlen - req->newidx == sizeof(int)) { int temp_int;