From nobody Fri Jan 06 09:46:35 2023 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 4NpJQ35tGjz2pD1W; Fri, 6 Jan 2023 09:46: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 4NpJQ35PRpz3wdD; Fri, 6 Jan 2023 09:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672998395; 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=L9ZgBX77DwX0dJDUFqQBZ+Xk7b0Pacju4OAd+SaeOl0=; b=sTleBtTUItFontGHwm92jF56AP3VlRB9vlrpL0QF962V7BGGpoPI0dQeiAUWn6diSWrtNn /QXOvs5yu6a8z3tvivwmuI6QJ6wkvybZn8RHXLq1FJSB9apO/wZKPY5K/ZYt9joGeV9zkE kYuV1TIEnOvrcVLhbshho/F5DPiwfpouC38WlrIB97eiS8oQZ5lZhg/Ix/c7VBwqtCLgJV sntAQetFL5cwalx9h3zftu4GiRgLr6/K4jI/6y3Nrj7rugiUpyVxjQboV+RN76Efy0E4uA VjbTaOeiM+hctiAJ/IjJV0xAacKJpfLr9OjdVXVJN7Pr9W4xPVRVme9lNsRT6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672998395; 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=L9ZgBX77DwX0dJDUFqQBZ+Xk7b0Pacju4OAd+SaeOl0=; b=VqxJCdz6Zsg+i3GM6aG8EW0z+PmZgqos7rSXXb5eSCd7hggffofng28QD5WoL0N9I/fPGF RRv5VlyUEsy5EBMBDuaq8l/fpXTJP0xv2vxsGpr5wLjrM9VFrE5cUg4D7yf+HhC0YAECVX q2M7re8VNq4A3zFg6POmEwQfHH7b0FpWx0I+cmc3HW4dg4ZXOsw0FWpItkMEyhBN40JlaQ d9aWNSPWAycfLUSyfM1EcYVLbilRe7BygicxdBJ2tDFn9URbvu+Z40AEQiNbFsHpu47+FR drUI/dWciFP4IkHwxqNXM+wpzJCz+BiVmq3TvFesNNlfaDonvm2L53+q2xWKQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672998395; a=rsa-sha256; cv=none; b=wnE/y4RSlpUqP/W5kl9dTO3Gn59lnoOy72M+ouV09mXmt4MZfziIXav/usw40XKvM0g9IJ ZuzeLztebOKreLemTEO6u6a8AdFHHJD198HB4N0joMGgJafL0UPmCslNs1WGztp67iCmGB qGLF0VPBjqB3lv+8fbWZj+Wc04fS3YXIwo6w644/o/XDi0jbKNApC0Zjm/eZW4YPKcl2zO ik3rIGqQJZ03yvY3L8F7wa10ncPbYZuC+1j+0ymxWj3YAF0D15uO2JM0TDW9p6m1SRfdF7 a5K7JxG/tUhh/fNeb60GiiU8BLAAFT/Sfn5gmwWCkeSkw0y0IpeY61QqnzSnnQ== 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 4NpJQ34WbBzPyL; Fri, 6 Jan 2023 09:46: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 3069kZqn090513; Fri, 6 Jan 2023 09:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3069kZur090512; Fri, 6 Jan 2023 09:46:35 GMT (envelope-from git) Date: Fri, 6 Jan 2023 09:46:35 GMT Message-Id: <202301060946.3069kZur090512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 47039ba1e03b - stable/13 - Don't allow stacking of file mounts 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 47039ba1e03b047e313f8f9d1d42ef89c0616163 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=47039ba1e03b047e313f8f9d1d42ef89c0616163 commit 47039ba1e03b047e313f8f9d1d42ef89c0616163 Author: Doug Rabson AuthorDate: 2022-12-06 13:24:55 +0000 Commit: Doug Rabson CommitDate: 2023-01-06 07:57:57 +0000 Don't allow stacking of file mounts Reviewed by: mjg, kib Tested by: pho (cherry picked from commit 71e9be1bd54cf54de6fa273af71468e790ccdf47) --- 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 e6bb6036a5a0..21e60c9e74d1 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1392,6 +1392,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) {