From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBBEB255E52; Mon, 12 May 2025 17:55:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072523; cv=none; b=Ox7d1gxA4V1f3FIkIVRP0Rvxya8A6oNQ1zttXkL4fBfSjXUlFpy2rF8JLEQUnxqLMbhRVz0RrE7RY8nTTlohPt8sICBhuVSg1QHw3ezE+/groKW7dEgu9cbMD4GMrZfWo3UpgdH3Pl8wSGnrmrCSFlij8IIIeCD/Oi5hEF4BRa0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072523; c=relaxed/simple; bh=fU5+QJWReumXgp4QNRDoAtXynWrcGZ/mJj7HIfIp10k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UKVYBgNLDFlQx9AaxRtJBMKDkXhmEqxJb/PyhvQTZxXmk+LLlWG3/nmf6XevVLUpEiSHEKDbHRMS6Ia6WxYM92+pIMaLts0ORoB25AYIJspsHNF/FD+ir6+OiAV03aYaLYiKQd+E++74p0lytU69l6ML2qT1SGb2Vp+AFUs6qEs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vPoqpRiU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vPoqpRiU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FE49C4CEE7; Mon, 12 May 2025 17:55:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747072523; bh=fU5+QJWReumXgp4QNRDoAtXynWrcGZ/mJj7HIfIp10k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vPoqpRiU3kriVL4NPEqYhwsppCHn2UMWtGp9aCfx1XynMjdkcsDyOk6CFvl0Kt/aZ HhGDMxs/XVT7qFN37KR2meSQVSFL7Xi0/nH+ppVlksjr0fLttqgdVxiiIRbjmK7onN n2RCk/SK7Dynpnp5W8zVw6Lt9TtdxC6uFsLTJmcE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Brauner , Al Viro , Sasha Levin Subject: [PATCH 6.1 68/92] do_umount(): add missing barrier before refcount checks in sync case Date: Mon, 12 May 2025 19:45:43 +0200 Message-ID: <20250512172025.891366717@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172023.126467649@linuxfoundation.org> References: <20250512172023.126467649@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Al Viro [ Upstream commit 65781e19dcfcb4aed1167d87a3ffcc2a0c071d47 ] do_umount() analogue of the race fixed in 119e1ef80ecf "fix __legitimize_mnt()/mntput() race". Here we want to make sure that if __legitimize_mnt() doesn't notice our lock_mount_hash(), we will notice their refcount increment. Harder to hit than mntput_no_expire() one, fortunately, and consequences are milder (sync umount acting like umount -l on a rare race with RCU pathwalk hitting at just the wrong time instead of use-after-free galore mntput_no_expire() counterpart used to be hit). Still a bug... Fixes: 48a066e72d97 ("RCU'd vfsmounts") Reviewed-by: Christian Brauner Signed-off-by: Al Viro Signed-off-by: Sasha Levin --- fs/namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/namespace.c b/fs/namespace.c index 57166cc7e5117..0dcd57a75ad49 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -629,7 +629,7 @@ int __legitimize_mnt(struct vfsmount *bastard, unsigned seq) return 0; mnt = real_mount(bastard); mnt_add_count(mnt, 1); - smp_mb(); // see mntput_no_expire() + smp_mb(); // see mntput_no_expire() and do_umount() if (likely(!read_seqretry(&mount_lock, seq))) return 0; if (bastard->mnt_flags & MNT_SYNC_UMOUNT) { @@ -1707,6 +1707,7 @@ static int do_umount(struct mount *mnt, int flags) umount_tree(mnt, UMOUNT_PROPAGATE); retval = 0; } else { + smp_mb(); // paired with __legitimize_mnt() shrink_submounts(mnt); retval = -EBUSY; if (!propagate_mount_busy(mnt, 2)) { -- 2.39.5