From nobody Mon Dec 19 16:50:35 2022 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 4NbQgb5m2mz1GBD6; Mon, 19 Dec 2022 16:50:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NbQgb3hg1z3j4N; Mon, 19 Dec 2022 16:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671468635; 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=jkk+BtT4JsSAF2JJ9QiK0O+i+Xu4Bqmwra4uMDZKbDE=; b=UCfvu13S44sGFZCMfuLrA8yMC3s2L32pU0OFbMn/NYuWJpPhY4jogNjxyhrHky6Lr7KxjN 0KzjTUd6CPfcqLp46l6kOLXzgIR6IqQRU/cLlW1HA7YEgkvNTa/5JPDBeroejVk5vdiD65 FVNsqR3AP6JCfSsAk2Mx565DGu4ZYd5lVs1+aveVf8XNxVoqxm7+p9Tj65bsRqF4GBbaNF 1RCbYzI04clquXbdHlr9ykXHmcnRrwVUiSMaBBs2A6MwdWl42jKG4tP+bY7tVqg6vkijzo HCaOG/l1T0T6buRaEw+Bt9CQ1FGkKvODuV2CHGvQxMgD7qqklHneRiDb7HeLQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671468635; 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=jkk+BtT4JsSAF2JJ9QiK0O+i+Xu4Bqmwra4uMDZKbDE=; b=MXgh4DO7Bg+dUSdq986zEvQnAypExBN3j7Ku/DB8zzllXgzKDLDoY9kBeloZbx6OtwEeHG qddifWsCvGRBia52GNVXsi1CuKLumMcIcUmBPcWQqdT0PYMVZyv/ezuaoKXYN6hd68HYCI ZjlNxTYBO3izoXx4rBOSr2oFouxBVJjztTgNUn0U21B1XRyFmP3vjPUH2hSzUYn2F6D8tM nrMk13UXxcgPKHWJWPC1h8wh2mxWxW3npWIh6bHrd5nV8OAAbfy52dWf1fp6AZbIM63Z7V 5JYwbEDzg+OfRilKpbWgO/usKnnadbql8RSK5lsFYbcHQBzs2rjXzwSQb2afng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671468635; a=rsa-sha256; cv=none; b=mng9r55JlLWF833vBK104H2jVe3ff2ninKG5IByhkiE4QxbTTn2eZhf+K1ZbTKCfPDqHDr L4ixf/ZImXqJIHtZ8Uze8K9kBag7+b2wp3RXnWE82M6YUCXW5ilOLFxoLX6F3nPYw7Pbmm UdVRGpNr2Ve6tA6x+cahoIuWlW6vuXKDNI6nj+AkWxUrU9xkulJaHImlugWvQs1+Jl2ObN hrguKlkbzAHZfwBjYiakLCJqsjLrYdvvtLttNpnZZ8yCtZPcdBLyNNVQTGsP78bmHokUDW gTmyle2SDfV5FOgarAkFj7GQyy9D3QHkwVuzFN6ON/AYcpAA1DaG8xCuJOEUHA== 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 4NbQgb2kyJz131v; Mon, 19 Dec 2022 16:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BJGoZ4D094569; Mon, 19 Dec 2022 16:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJGoZfc094568; Mon, 19 Dec 2022 16:50:35 GMT (envelope-from git) Date: Mon, 19 Dec 2022 16:50:35 GMT Message-Id: <202212191650.2BJGoZfc094568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 71e9be1bd54c - main - Don't allow stacking of file mounts 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71e9be1bd54cf54de6fa273af71468e790ccdf47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=71e9be1bd54cf54de6fa273af71468e790ccdf47 commit 71e9be1bd54cf54de6fa273af71468e790ccdf47 Author: Doug Rabson AuthorDate: 2022-12-06 13:24:55 +0000 Commit: Doug Rabson CommitDate: 2022-12-19 16:46:27 +0000 Don't allow stacking of file mounts Reviewed by: mjg, kib Tested by: pho --- sys/kern/vfs_mount.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8de9d3c4fff8..67a72f095786 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1551,6 +1551,12 @@ vfs_domount( if (error != 0) return (error); vp = nd.ni_vp; + /* + * Don't allow stacking file mounts to work around problems with the way + * that namei sets nd.ni_dvp to vp_crossmp for these. + */ + if (vp->v_type == VREG) + fsflags |= MNT_NOCOVER; if ((fsflags & MNT_UPDATE) == 0) { if ((vp->v_vflag & VV_ROOT) != 0 && (fsflags & MNT_NOCOVER) != 0) {