From nobody Fri Mar 28 00:46:15 2025 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 4ZP1zq4Hnmz5s963; Fri, 28 Mar 2025 00:46:15 +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 4ZP1zq2jnDz40wY; Fri, 28 Mar 2025 00:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743122775; 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=mSNLN0OiS4XS+Biqkv6ay6nsq7UjCoqchO0Zni+m4ZA=; b=xwWwaxNkBqFrfDB866Z8ld+6rTYROYYYPXOdaJIEReEFcIJba+cKrxhdSEEe6uuT0boTtK 412oSev7k38y2XxwAI10mBf8084HDczFQN4kv4h4429EwFSC+EhjJS1U3njl2YJ1F6V7/Y HlzPvaIPyHDFjeZJf4IyHXFgA6AxJRVxnkLl0+36eVa9tWvgamHUAMJTg+ejC54UmFmHQS dYU7vrvyBxCL/XFCoa/GSHgRNDWLl3OryKbXcfySh7fHjJbTwQhn3xhbf7BX/l8yB3wLhg aaIgoeMtc7Iq/ewT/g13Zm6xLw0FYuF3cKHd5sFCVeEqZcyk4s7IPAO6gwa6KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743122775; a=rsa-sha256; cv=none; b=hvFmpwxNf/5IdtZHIq/gJCSt1C8/Y6agz6V+f7nd25/dAYrc6GXl6ZSiYv/Uiw+ctzQQlh Ba6Tu3CKNdGKYheYNX+iKl2fLDzUvIdczvdyp2BNpUgHQRCZiiH4K9mYvcTL+6ANTQKTGg EnQyMLOzWBpooZx4j2Y6UVH3BH7iqmkR+DBQImxZi1S1GD3Fq0fhFMG5sljjKFz70LHK9l 8dUq6lOEbNAOlg0JP9RLDj7syk3q4MXpJjmRF80lf/M0YYGT+kuTUZlxs58yQJNn1KjU5w SF6qbyVJToRd034sVY5Ba5OThRhtvkEkyZGPvZkOyrIZDefPPFBHk3MqWVK41A== 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=1743122775; 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=mSNLN0OiS4XS+Biqkv6ay6nsq7UjCoqchO0Zni+m4ZA=; b=Ijra1z8ZQwAtwfgA7ie4CBoWKwLZJQ2u9uXvkzIG150jhn3o7w8Jq+B+O4vLg91Ux86ZYE t8S3q1EA+a5F++wcIw+iSZNGnGw37vtbugyPof/01sOeNH15lSAmgDF6b4mBWQ55wfdEC4 LESfusRzWxC6NqUzdyzFDu1xR8Yj0c0GsrQzPsb6t+2998brbIS1FBKZ/YfbpFepWrmAH7 S7wN7I47yYY59Itrhof0DpCN+BgrRaRddAZTsRQ95z3gU/tzuMapw0q1xPfWr7UJQ5DQ9s j2MUy3/lJqO4cXUMETXR1AReIQG5c4nEq+hfPXCYBmvp0dHckOrmakj21KhOHA== 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 4ZP1zq28XFz53g; Fri, 28 Mar 2025 00:46:15 +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 52S0kFVX060980; Fri, 28 Mar 2025 00:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52S0kFQM060977; Fri, 28 Mar 2025 00:46:15 GMT (envelope-from git) Date: Fri, 28 Mar 2025 00:46:15 GMT Message-Id: <202503280046.52S0kFQM060977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4e923ed15e70 - stable/14 - ufs_aclcheck(): accurately dereference vp->v_mount 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4e923ed15e70c9256437e96cfb6636418a9d3838 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4e923ed15e70c9256437e96cfb6636418a9d3838 commit 4e923ed15e70c9256437e96cfb6636418a9d3838 Author: Konstantin Belousov AuthorDate: 2025-03-20 18:10:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-28 00:32:28 +0000 ufs_aclcheck(): accurately dereference vp->v_mount (cherry picked from commit 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5) --- sys/ufs/ufs/ufs_acl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c index 49bd686a0d96..4b6cabc2ab30 100644 --- a/sys/ufs/ufs/ufs_acl.c +++ b/sys/ufs/ufs/ufs_acl.c @@ -609,11 +609,11 @@ ufs_setacl(struct vop_setacl_args *ap) } static int -ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap) +ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap, struct mount *mp) { int is_directory = 0; - if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) + if ((mp->mnt_flag & MNT_NFS4ACLS) == 0) return (EINVAL); /* @@ -631,10 +631,9 @@ ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap) } static int -ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) +ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap, struct mount *mp) { - - if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0) + if ((mp->mnt_flag & MNT_ACLS) == 0) return (EINVAL); /* @@ -667,14 +666,18 @@ ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) int ufs_aclcheck(struct vop_aclcheck_args *ap) { + struct mount *mp; - if ((ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) + mp = atomic_load_ptr(&ap->a_vp->v_mount); + if (mp == NULL) + return (EBADF); + if ((mp->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) return (EOPNOTSUPP); if (ap->a_type == ACL_TYPE_NFS4) - return (ufs_aclcheck_nfs4(ap)); + return (ufs_aclcheck_nfs4(ap, mp)); - return (ufs_aclcheck_posix1e(ap)); + return (ufs_aclcheck_posix1e(ap, mp)); } #endif /* !UFS_ACL */