From nobody Sun Apr 6 22:51:09 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 4ZW6yQ2Pt1z5s8Rv; Sun, 06 Apr 2025 22:51:10 +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 4ZW6yP66Smz3KSY; Sun, 06 Apr 2025 22:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743979869; 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=O5Txn8gi+lTQedH2Ux/DtrpwyzhS+DoPEHeF9/hqXCM=; b=rH9nD04lly3NaeP8RClM8tZvUOiwAmQbxfQNOHfvppo9W+0fEnvY3S5wdw0wMybxszNFOa 6SEneoZf8zhw2w98f7MAePg6U1ku57iQPO5CDUK6pBNyoKJuqmZf0qIC2ny7BPlZt/fwgU +hW0K/FGJfquwJkHSwcJgUNWQbvD3TgRvhd7dQopguKbTO8Z1heyBfpdxP/LmzzBhb9zIA KM8TYlmeaRO+gyfXNaOS0o2esl2Vmh1cDd4tkg29/dqhgXUw32m1H+jwed2iejxXrA8YWz PjDHbjKghxtusIFo3CzVcXcvqN6qqegROuBG5QSSqP8c9CDontUb7bGDk2EKZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743979869; a=rsa-sha256; cv=none; b=KOvPHkVuFoATqB3f0zH7bYuWi1uE66rHWe5o/o9pNdPm6HemPgBq7ZLm8aZoTy5oWi0ALg EmXB5GxgwcTjV/galELa0YhcTsfkCAUojxhA1tfEC67bIr6kvdRkcY61S3mEdscj4w3dbB GFVyFMDt6ka49GZLtNrx7blkmJQRgaKF26Jp+NJrbHANK5NQr05H10yHlD2VkqXsOqqL90 h3mM8Sb+U0UkLRim1wRhCU7obYG0Moqw1JCz6XjGOALoC0rTkeRzNXIsmOFy7ybweWzvDJ 9IRwmHgdMSas3gr0Se7ez+Zl23MZb3hrEyvAPjmZ37zb8Luie55wtcddbIboeQ== 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=1743979869; 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=O5Txn8gi+lTQedH2Ux/DtrpwyzhS+DoPEHeF9/hqXCM=; b=Zswde0e5oBl7gBWu0DIPlHb8uXd7c7xUvS12JjWEigo3awO4bgZbuAsP/f6/d6T617XQk1 DJD7ZurZ9hncU7LmOlL8Uc051ISC5YqOOJ7vAjThEFZzhuPFYzZB0g9fZ+/41o67769S+U MHPMzca6TU2No26gA6KKk3eeQdKHw6N25LAQ7XltgGTBOnh+NO/FJMo5Fnu9OkRVfzp9lh 0L1FO3ZEmeW8Ewpm4MfAKEGUKMgm0pYRLfgEs3Y6/d5fZpUVwhPmKp+RdFQHWw6FYXbQuv rTRD3Ul8ers3IhSqf17/DJQotUgbxBjux1NuMnNJQroFsEPSEEr5w+OQolaf8A== 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 4ZW6yP5ThQz5Xt; Sun, 06 Apr 2025 22:51:09 +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 536Mp9nc077054; Sun, 6 Apr 2025 22:51:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 536Mp9cU077051; Sun, 6 Apr 2025 22:51:09 GMT (envelope-from git) Date: Sun, 6 Apr 2025 22:51:09 GMT Message-Id: <202504062251.536Mp9cU077051@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: 014ce35640bf - stable/14 - vfs: Return early from sysctl_vfs_ctl() if no input was given 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: 014ce35640bf1a00edf3f7163c3248bb484c29f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=014ce35640bf1a00edf3f7163c3248bb484c29f2 commit 014ce35640bf1a00edf3f7163c3248bb484c29f2 Author: Mark Johnston AuthorDate: 2025-03-20 01:34:18 +0000 Commit: Mark Johnston CommitDate: 2025-04-06 13:54:03 +0000 vfs: Return early from sysctl_vfs_ctl() if no input was given Otherwise we end up searching for a mountpoint using an uninitialized key, and likely failing the version test. This violates KMSAN's invariants, so simply return immediately instead. MFC after: 2 weeks (cherry picked from commit d8703cd80247ca203b817305753bda2b7dbfb5ef) --- sys/kern/vfs_subr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5a0a7f9161ed..6c116448a59a 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6451,6 +6451,8 @@ sysctl_vfs_ctl(SYSCTL_HANDLER_ARGS) int error; struct mount *mp; + if (req->newptr == NULL) + return (EINVAL); error = SYSCTL_IN(req, &vc, sizeof(vc)); if (error) return (error);