From nobody Thu Mar 20 02:53:17 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 4ZJ9B64CC8z5r8j9; Thu, 20 Mar 2025 02:53:18 +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 4ZJ9B546vxz3cFL; Thu, 20 Mar 2025 02:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439197; 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=nFWKmVapJjNeerERzjJQa1Vjjmu2VnT+zTPiYMpQaB4=; b=yZn7mzOb0bYdrCeiVKqr7npE9zVM0lpEipWAxIgjQfbtqAr5RTXFh3taE6gE+23qJcVC5+ YozbMiTI6J7vguGcVlClBfPWfjPzygpbzXoIzIfH3IMClrimem17x610qBNnPwawFMyKZx /3vgSgFSf5EyC0oRKyUPGUWiHe6coMMFwxc+diwVz69f9+FSdmp9NKNE+gczM3M9xg64eh jgEEXjfDeFXMXYs/KnxMFzhuBxV6L2GuLcCZ6XP26e9Kr3u5zhk14mru0pZ0V7lgiZ4Asa aP6gG/m3Zk7ceThus063Fy7MhywUPYCTvDQA7Y+4qWj0fJd/p5g2CMRokbg1ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439197; a=rsa-sha256; cv=none; b=UrI7MPoroGOlzqKLd7EhFJsKndhDY8pBKbV49/Bp6N0Zqg/8zIL2xgOSk5iGouVdxu81Nt ynuy7hteeMst4W/o6+UWmTr9jW2Xzh9tHYx1o5leV66SAdaPHkV/a7rQ8iqsioTbyHTAcK lJIgjA7Tkv9pPxPbKfW/34es1diPKA1nnmpxpBbjimPIaRzV8yOgiAARHTTj/GVr1C2XdH tZ/1OCRymo4USsy2qdBi0+yxfNIu4ek4/MCRKdsJyaMlopdQ0JSjO8BazFjlGhrUieZzJC 88+IyZXGOLGSxbcyHc/IvcNezwjkrkBrDjwt/1Kd5o1vU0+8dMOxJa8VXMWIuw== 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=1742439197; 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=nFWKmVapJjNeerERzjJQa1Vjjmu2VnT+zTPiYMpQaB4=; b=BLSTwhi8xiMH+S5fnOF6faFx7rCWpnBPZwDzRKj0qll0JEsfGj6aZhdQVjDZLkeeUJ2BJ4 TVA7WL8BoLL2e39+b7HGXe+fU+shzdN5HyneCdrFxzpGXNv91lbyevDqH8hW/Eul6ACQAi B/luIguOSGKpNNva5lwIpVi6pijHhnJF/UvVegExxDvKLH69sHq/HXv+srVDdI/EnfDhe6 EbJX2V9/G6wWNkB7LzOmg1BcxOr6955hMkY3/j/Hxg9WFlb57hPX0xYJOOU3Onvd2/1xES x+4EKhcGZt+lNo2HYtIRMEwlNM0X4TQUUgwrqg4rJtONukcSSx1XAe/hEk+zAA== 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 4ZJ9B53fTgznFR; Thu, 20 Mar 2025 02:53:17 +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 52K2rHGh046540; Thu, 20 Mar 2025 02:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rHJM046537; Thu, 20 Mar 2025 02:53:17 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:17 GMT Message-Id: <202503200253.52K2rHJM046537@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: d8703cd80247 - main - vfs: Return early from sysctl_vfs_ctl() if no input was given 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: d8703cd80247ca203b817305753bda2b7dbfb5ef Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8703cd80247ca203b817305753bda2b7dbfb5ef commit d8703cd80247ca203b817305753bda2b7dbfb5ef Author: Mark Johnston AuthorDate: 2025-03-20 01:34:18 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 01:34:18 +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 --- 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 95ed98d3217d..96e8bb765972 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6519,6 +6519,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);