From nobody Fri Jun 17 19:41:02 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 22FB385D621; Fri, 17 Jun 2022 19:41:05 +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 4LPqCh169hz3hkN; Fri, 17 Jun 2022 19:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494864; 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=dnKwKSgdFFTAcX6jjco0jCvEuHpx2q1f5Xp2YJl+UYA=; b=c2jFL4uSXkRthvl3Mzd+Ai47ayw/N/PEi3u9EKLw8IR14Sni6qmv3keTV2C2fDmrz566sB NZK2dkDJFx/8+8idk6VC3Ysfh4TtqrJVHrK5UntL6u8kiGU185ouFXS23m/8z0Dhv31ox8 7afFNkzMYh8/fzwozkclqKUFP55RKAkJelJAw/E+hutc9wFx9Oms5U45rd9hTmp1OoLxI3 GOlaGK9YqelS/prn1aO9F77dvtE3gvGDfpYmwuqfRsDS4gq2zDH8jyirYHpJQ2tYDrrHqA aOaBdfdEkA4e5yK0xy0am+qKKFCrCbBJ9FRADo93B86jt9YE9Bxbo2+v5hFEDA== 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 0F99725C71; Fri, 17 Jun 2022 19:41:03 +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 25HJf2CA029956; Fri, 17 Jun 2022 19:41:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJf2Wi029955; Fri, 17 Jun 2022 19:41:02 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:02 GMT Message-Id: <202206171941.25HJf2Wi029955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d63a4afcdf48 - stable/13 - linux(4): Fix unlinkat() after a125ed50 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d63a4afcdf485b3acc3176052f76ea3002434bc7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494864; 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=dnKwKSgdFFTAcX6jjco0jCvEuHpx2q1f5Xp2YJl+UYA=; b=OQ0ozqWVkPoy19W+ZsFYra9DTBY98AEL8elT8SU3Q7xafuJW+XK2p/CDPAQxRJAjrr7yD/ RPiHSvWUVEZb+NeYEFbeftMn3JZji5EW/H3PIru596zSOOkBC5ht5TUbPlSoj9+bAyGg0c 6B0oZfxyVobrzvZA2NlwEHOJfwU9yF+OBTASWOPs2I6s6h6RDkpKPreNsjTybfrZjJQ1rh Ymn0sylWxem1oRPQpNym2kffR8vr633cBEvE85dIatOWNNqKtsvUwMKks6hpw+BDe3xL/a LoZFwppmOTJ0EH9IiLuEncBSUWQxsfPJcwlWqHeVp4p4Lq8vM+c40agc5T2bRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494864; a=rsa-sha256; cv=none; b=f9L5TtNOAm+iuxNLttg1hO6f6ayiIiGWvcV9np30fPFJp1+5k4qGBFGR2DabQ4fkuYX9Eh 1fzmqmZ+jbm1GKMbhOWqnkNlaz4GiDL6KUDXInCDv6UZ7ga7Km1PIpJuhPsNP9zRaWWpT/ XKiu5FGEWC+M7nbBd99/bwgZhUsXgyLbu0CD2cgC+d9I1cNPdOOJN+Tzq9RDhZov2rwE7d ca1cHdFhksVZCLLJw6rhf5jBfDEimldIgLchIFuwDoKuliIexhltsxDiQvCHFz9YHUvp2W EFdOMjQHzFSAdce75/yrsrSkjUx0zsmzde1XitVNEZHCdeTXOWrVMF8vHmqXMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d63a4afcdf485b3acc3176052f76ea3002434bc7 commit d63a4afcdf485b3acc3176052f76ea3002434bc7 Author: Dmitry Chagin AuthorDate: 2022-05-23 10:19:34 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:30 +0000 linux(4): Fix unlinkat() after a125ed50 MFC after: 2 weeks (cherry picked from commit 1bb3faed29cf1f451bcdc396eaa4f8cc476f9159) --- sys/compat/linux/linux_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 2664b38ad1ad..3b712cf71e60 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -778,7 +778,7 @@ linux_unlinkat_impl(struct thread *td, enum uio_seg pathseg, const char *path, if (error == EPERM && !(args->flag & LINUX_AT_REMOVEDIR)) { /* Introduce POSIX noncompliant behaviour of Linux */ if (kern_statat(td, AT_SYMLINK_NOFOLLOW, dfd, path, - UIO_SYSSPACE, &st, NULL) == 0 && S_ISDIR(st.st_mode)) + pathseg, &st, NULL) == 0 && S_ISDIR(st.st_mode)) error = EISDIR; } return (error);