From nobody Fri Jun 17 19:24:08 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 9BE95843D0B; Fri, 17 Jun 2022 19:24:09 +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 4LPpr86Rzxz3Bn1; Fri, 17 Jun 2022 19:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655493849; 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=ANG1E4iw2N3zyM3T42jXu3YmerqPchaIqnwXzGALBWU=; b=s1wgleksSo3MUCv4pXo7YIrt7/rdR6ss+1wkMRJqOFpuoT0eOD2+YEgBHxSqJoAHd3JBpZ 72Yi5lVblCPOO6pizHOGXlc12IjZqikEcfUt7ctQMis2Ao9dum87irzp/gHgdzwgp5SRQr 6g4sQ7ZuhY4+zUIbtBdUS94ovNxwZ30ObaJJLNLX5m6grcRXyz1ZfoD0vBzAP9ShL2NiqD mS9EJwq5xxdX68rl1m8Q72Z3toKuNImBmlTigCB+Z62HMTiy48z+1DNyQcL3cE0BBn5T2M QtEEfDNWIqLIaXUZBiVw3Jew3XR48bOCzuCQcadV9nXFyw10uQTBaSMKFIfyOw== 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 73E3D2563E; Fri, 17 Jun 2022 19:24:08 +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 25HJO8FY096036; Fri, 17 Jun 2022 19:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJO84c096035; Fri, 17 Jun 2022 19:24:08 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:24:08 GMT Message-Id: <202206171924.25HJO84c096035@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: 0f5f0e5e56ae - stable/13 - linux(4): Convert flags before use in utimensat. 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: 0f5f0e5e56aeee139be5654af646f330d7ecdfb0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655493849; 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=ANG1E4iw2N3zyM3T42jXu3YmerqPchaIqnwXzGALBWU=; b=nMJDGKMtuCKxqaQ/ifc1hnYSEOpSD0Lb91k5oqJFcBvYqw5xXbWb+/nzOwJNzfEyzoNpCJ KhdhUK+gTtZq/Xa/FjhmQ+UCfXDxihJK/NE4hPXxYHlALcs5ex930hgs3k4vM9Q7sTA0Td IWGhN7GIbFVP44G7mOddPHvTywa2CPmZNDn18tq90cTI3erYVHQ2PWFloYn9Es4HHo0kqQ en5uPMDVEAcjTabDFDhgCpiBkQaw7djn2VCJ2OBJ38+U0YbJCE/YgkK2AcsG7BnPGQa7Ij YCChcEJPBmQarW3CErN/bcLpl3jjW96DsOhxmxsvu9T1QRhKQLIqZ4mmpueQbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655493849; a=rsa-sha256; cv=none; b=YClrv9QP6QJS5mIm66D/YBzxykj2U2Rt5wvwEN+VXUG6DVqHHruSRQb/JB+/teQjVDQbDC Zt3UrcD9XvXwmO4SIj7IY9/anW/Fr0WClmoeR1/WeKCvaMSq6wWiJD6uEEHmlWU2gGghSB Gl4cWBidcJ4sFTmslVzhJ1jgzgLLYieleiO3Dfbb/EMIcIhO19SnaM5sm6zqtDShWp91gq ZpM6JM6YGgI/ej+YlSzX6VZ+rG7Nc3BbNeTT0aBImLV1ZF/pNfSFJumxIjYBMpBnsW/h9E 0c90FuCQN8PPCVVHjMqeidbx9NoCIsdQFG5ZPpH+R+2UZWYZGH1BJtML+qku7w== 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=0f5f0e5e56aeee139be5654af646f330d7ecdfb0 commit 0f5f0e5e56aeee139be5654af646f330d7ecdfb0 Author: Dmitry Chagin AuthorDate: 2021-05-31 19:30:37 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:22:16 +0000 linux(4): Convert flags before use in utimensat. Differential Revision: https://reviews.freebsd.org/D30487 MFC after: 2 weeks (cherry picked from commit 8505eb5dd8f743f29e9c93b6814a34f1890e6c41) --- sys/compat/linux/linux_misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 98be575b7b6c..cb129179a44d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -861,6 +861,9 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args) return (0); } + if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW) + flags |= AT_SYMLINK_NOFOLLOW; + if (!LUSECONVPATH(td)) { if (args->pathname != NULL) { return (kern_utimensat(td, dfd, args->pathname, @@ -873,9 +876,6 @@ linux_utimensat(struct thread *td, struct linux_utimensat_args *args) else if (args->flags != 0) return (EINVAL); - if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW) - flags |= AT_SYMLINK_NOFOLLOW; - if (path == NULL) error = kern_futimens(td, dfd, timesp, UIO_SYSSPACE); else {