From nobody Fri Mar 21 23:40:40 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 4ZKJpx6P8bz5qslS; Fri, 21 Mar 2025 23:40:41 +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 4ZKJpw69hyz3vVw; Fri, 21 Mar 2025 23:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600440; 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=7gTRufVHCex0ZUM3ET9K4LvynEb95qRTlp6sX2py5js=; b=bKLqaetFs5R+esKoJWtrBaHD8nWOy0v5OyKenTi9AI3EiJmThfRml7KEAxnKcNlh0oaVm/ Lsy7MsJUSgyZI3J8cmbY6dIBSnmPnYuz8EeAnVep5W5m9MtSSvcDFa5IMaHz0YxaBQhAQf Xcrv0ZAGqQts8+ttoDZ3pgfoxlilXmocebW3cNRxDB4RsVjBReqVoWUukeC9E1Y2bKZ92M za77GoVEXUGmMaQ93/+0JfxsdTxs1Wth7ExOhTD9UfZHBpab89ZuyUMPoP/lsBemP+Zh8R 7vE5vL4AghZImfM+f02+zhKo9RYRBIJK/B06J3WP/DHz8+KPHa5JxptoXycBNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600440; a=rsa-sha256; cv=none; b=h0M0ELWc2Y0mrPBxah7/HnZ8vcYZTXmU7jvh631JC04mEUkZRt6Jeauk+zreWLC8ntImUS Y91s912gad/OkMsGY+G1GtOPE3FRPAVQcvxEH6Itk4rOfSCfGdgxcDLd/SSescAdEGZfBC KUNJ1ueo76lCmbvKsVQ0dlb4BlaBlTA/PnuVvQTog3eejad7AIZoFVy97rZO27+ajG5IAv 2t9VRnLSkn8J9wpFkxH/Ij9QSICg6S4S9f0BoPP6nS5i8lHwZh56QBFkUNxXeeqjoIRJjp TDVMyZ4lFG19hVNVtI1iC4tcJv1GpVKJJXbtipsGKoQuEpLRaRIcFSZxPPaitQ== 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=1742600440; 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=7gTRufVHCex0ZUM3ET9K4LvynEb95qRTlp6sX2py5js=; b=Hi8n4hk01cVNsBFPPJuUamBJZaL5ANxv6LjeVY/n7RaQjuDvS0ZBHMdhM0RHG8fD8Gfnl5 O3dkv4rGvgwDR+j6jxUzxba7/o2Iz8aGoxpF+gN6lGASV/3V3YSXeGumehahqEs8Ta2g5O iCmyem+Fwi1+CkxMkTMy6etI3HwZh8remydtXxWxJREP6FnhAzkcNUYpgZeKgc/5DHTUDM 1A1LfwcOFvFJzM/gbJgY6dCYPFO74aFYoZ6RUh6D4LW24nHddYIFEdufDQGbIQ6pFAmt66 v6gJIVDAUdDK72jbOJVBj2+Tk1wK75LDdsj+yvKZMaP/uSt+Wcu6velTxWZBcA== 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 4ZKJpw2xn4zwLw; Fri, 21 Mar 2025 23:40:40 +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 52LNeeNO079271; Fri, 21 Mar 2025 23:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNeeia079269; Fri, 21 Mar 2025 23:40:40 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:40 GMT Message-Id: <202503212340.52LNeeia079269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5648c1d6f3b0 - main - ufs_aclcheck(): accurately dereference vp->v_mount 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 commit 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 Author: Konstantin Belousov AuthorDate: 2025-03-20 18:10:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:40:00 +0000 ufs_aclcheck(): accurately dereference vp->v_mount The argument vnode passed to VOP_ACLCHECK() is not locked, it is not safe to deref a_vp->v_mount without ensuring that the pointer is non-null and stable. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 */