From owner-dev-commits-src-main@freebsd.org Mon May 31 19:31:09 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CD7764D969; Mon, 31 May 2021 19:31: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 4Fv54Y2w0yz4l1B; Mon, 31 May 2021 19:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4CB5A15FB8; Mon, 31 May 2021 19:31: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 14VJV9wJ053588; Mon, 31 May 2021 19:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14VJV9VA053587; Mon, 31 May 2021 19:31:09 GMT (envelope-from git) Date: Mon, 31 May 2021 19:31:09 GMT Message-Id: <202105311931.14VJV9VA053587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 8505eb5dd8f7 - main - linux(4): Convert flags before use in utimensat. 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/main X-Git-Reftype: branch X-Git-Commit: 8505eb5dd8f743f29e9c93b6814a34f1890e6c41 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 19:31:09 -0000 The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8505eb5dd8f743f29e9c93b6814a34f1890e6c41 commit 8505eb5dd8f743f29e9c93b6814a34f1890e6c41 Author: Dmitry Chagin AuthorDate: 2021-05-31 19:30:37 +0000 Commit: Dmitry Chagin CommitDate: 2021-05-31 19:30:37 +0000 linux(4): Convert flags before use in utimensat. Differential Revision: https://reviews.freebsd.org/D30487 MFC after: 2 weeks --- 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 fc846df6689f..2be328a0d6d2 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 {