From nobody Mon May 01 06:46:09 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 4Q8typ0wrbz47tYy; Mon, 1 May 2023 06:46:10 +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 4Q8typ0RcCz3vdX; Mon, 1 May 2023 06:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682923570; 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=SWhI47WsPtrT0zYWaHdFvncOuC+PmrhS6Jp/QSxt8es=; b=RplPHTWVCNxmjE3dag1mJgIotJZ0nbVjQ1D7sFauTmRFMenpkyrC1yo3flltZhbogXKXtV z/LemnENbXJ3sngVkAHVeX9bYkOWZJtr6MvTPzYCJHfaTii4OIt9N256d7uP8wXakTtBJw HGja9EZvTKXbAURKbIBZBNqiTTxMJrRjJQMu4uns1WXaIuD4NX9kxJpGdBcgstrkMZC6Eb ziVbIphqveKbvtCezTG97kCCgPM1cKxCOh6+q/I2cKpXia5jKwxIo5/tbAakyoqjI9u2dz SvdPpeXJJxUaSOK8hmmEOxn8Q7dccoxX/FIAXFCCT7pASStA2Di8oNEMiUPyjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682923570; 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=SWhI47WsPtrT0zYWaHdFvncOuC+PmrhS6Jp/QSxt8es=; b=GgxO7sCoeXVjQGgEXHfWLxjXhKBCyeEOVUKIpjXVYHvTGJClLGEBVfNhBfnhLYGAxCXDpO PJ8d4yN2lNX0CTDyOglcTi2yjuWQejrUGq3CqOc5sS4MWyj3CNTmJn3sYMOkuXbfwORy80 Aday14gLRbZ72w8LQZBRtbVnjr2tQMfpXEjaUPd5bIOlOlejedQfd/z1Wx7Nzq9vxxIggI GMlguthfmQDl5pTcckEZMgVZ6zHoyIc2Woq8kpjwpKPIRdUEl8A9KmJdItCOX4jwv+Owbg 7F0qABz7GM3MqsD1XYdG0CzfjktGJwEvX/mBPW3FgbZcSYYUILrw6psopcArCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682923570; a=rsa-sha256; cv=none; b=wUAaXLpwRZS9wvO+S2SMaNajrJnLEFBX3Y5blQUqlK95kz6FUV35i0qndeQncQR1yMYdHD YvK48m8PwmscoA3jms/ynbvQEPZsuKp4SiwTGZRVsrybvAhtPoLky3M7wBS50DV5nskFIO g0stnhjAh8SgLlS9fBrUoCnpS0NhPrnB/qWfkJz8q5bX5AQLfJvUy8x2HnJp32Atg5lIPV rY+qQW7LCNiY/ZCcJ7/IweNXwZS96oFWafQKwew/RSOTqSbVWH5Yb8P/9Z9aWlw2uq6NvY SbYXfLjz88HCKrwSw/ekvnWzkFf5TjlCE/f1tzvzjXerbQ+lV/ILsdZQB4mcdg== 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 4Q8tyn6W9hzvMq; Mon, 1 May 2023 06:46:09 +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 3416k94l030215; Mon, 1 May 2023 06:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3416k9Lu030214; Mon, 1 May 2023 06:46:09 GMT (envelope-from git) Date: Mon, 1 May 2023 06:46:09 GMT Message-Id: <202305010646.3416k9Lu030214@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: 16004e477d38 - stable/13 - lookup(): ensure that openat("/", "..", O_RESOLVE_BENEATH) fails 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 16004e477d387d6a075597ec76f0dc82d02b60db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16004e477d387d6a075597ec76f0dc82d02b60db commit 16004e477d387d6a075597ec76f0dc82d02b60db Author: Konstantin Belousov AuthorDate: 2023-04-23 23:21:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-01 06:45:28 +0000 lookup(): ensure that openat("/", "..", O_RESOLVE_BENEATH) fails PR: 269780 (cherry picked from commit a718431c30a57226bc7c1a9181fc84bab00641a1) --- sys/kern/vfs_lookup.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index b7ce93f3702d..7eca6eddd484 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1014,12 +1014,16 @@ dirloop: pr = pr->pr_parent) if (dp == pr->pr_root) break; - if (dp == ndp->ni_rootdir || - dp == ndp->ni_topdir || - dp == rootvnode || - pr != NULL || - ((dp->v_vflag & VV_ROOT) != 0 && - (cnp->cn_flags & NOCROSSMOUNT) != 0)) { + bool isroot = dp == ndp->ni_rootdir || + dp == ndp->ni_topdir || dp == rootvnode || + pr != NULL; + if (isroot && (ndp->ni_lcf & + NI_LCF_STRICTRELATIVE) != 0) { + error = ENOTCAPABLE; + goto capdotdot; + } + if (isroot || ((dp->v_vflag & VV_ROOT) != 0 && + (cnp->cn_flags & NOCROSSMOUNT) != 0)) { ndp->ni_dvp = dp; ndp->ni_vp = dp; VREF(dp); @@ -1040,6 +1044,7 @@ dirloop: LK_RETRY, ISDOTDOT)); error = nameicap_check_dotdot(ndp, dp); if (error != 0) { +capdotdot: #ifdef KTRACE if (KTRPOINT(curthread, KTR_CAPFAIL)) ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL);