From nobody Thu Feb 17 10:55:27 2022 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 77DF119D49D9; Thu, 17 Feb 2022 10:55:28 +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 4JzsDc1bQfz4jjf; Thu, 17 Feb 2022 10:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645095328; 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=kYpzAamizSR159QYcjdJ/rCSt0oCTiS2qw6noXw/MRs=; b=TX/UwaP/UvHtZNcoh1YgGjRaO0C01xXQ7bhhqPMQpLzEsbq3lyriuhF4nPx4vTyHzHNNE2 n+/TVH0CZJJKOfVfZxa49989ME6hV+B5z3K+ysKbo/Lnsq6qK6vXPgWde0yAakcFQBK3nR 9a2hfGeCDLLDjLWbMx4oOmKfHg9QS0RclafCOZtaLwvKABorl2SFdPMiCIwqNpJWiPC47K KH4z0DzusYQuSsCE3Ij1wbtsqjoyQfd9qJvh0Bm2T3a+CBuij2ypajlV8qpI0X8URuWNjA ujZ5ENvZgynIWEDIx6e28R4PvoRElGx3QmH0YO8P5TELTkuEknnXfAdOCtjkzQ== 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 E479D5CB; Thu, 17 Feb 2022 10:55:27 +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 21HAtRk4019964; Thu, 17 Feb 2022 10:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HAtRn8019963; Thu, 17 Feb 2022 10:55:27 GMT (envelope-from git) Date: Thu, 17 Feb 2022 10:55:27 GMT Message-Id: <202202171055.21HAtRn8019963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 8e4ef1c3a3d9 - stable/13 - linux: make fstatat(2) handle AT_EMPTY_PATH 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8e4ef1c3a3d93811b65be448fb4650786a66a430 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645095328; 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=kYpzAamizSR159QYcjdJ/rCSt0oCTiS2qw6noXw/MRs=; b=IIOCbe+W8N7MGUibKpaWdcWuQyp3XT1P/7YqWjtidyp+Mm9uSAZQrv7poxVptsaQWw+VF9 V7uyDIE9dp/GVTEUVdwe6uzVoxiHxZCAS2wKXZyMRLX+RAF1IyjkW/3VyE+8b4Fa5lqMC2 /5GyRy1Z5Rdw1e0MMSifkfmZy6Y7Uj4iSmDB4KyBqfAUoIminFwfPUQA1Rm9pdTm/JdwEo 2u6m6DAABfs4qRNuJRlf6g4UyrmgY256o2mL9jLIh70f2R5sEIlgbhR/fC01776umaPKuw 8y5YR/Ht1dohHtZAHvAJvoRQmUjf5BBQFrmX5dIAOB4FUwOLD5byx/03RBN2ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645095328; a=rsa-sha256; cv=none; b=hwQiCtABlaV6so6+wrj7KtJSwuXaBNyx9LECX+xKt0A1ic23H6NW/vLaBSDseiRIdZd9io zKnH04E0lLNFKOcS8Moip30wUJHDuORZQbEQF+sEktrJri1LcnJilii7FQgNfPz+rj5AM/ jfRuN6uaGbQWKKkUcqmd8cI7BMA43crgxwr7JP+XAL7sRRCWHS2ayBCiYslBmtc9Ft3vOX 9eKIaKEJdNcrhv2H2Q2tSXdEYpuhqr8XDo11X9JrFEkTo3BpM/eFHq5DgDTZ5AbuO6MBNJ TGKjwIrqtim5mAiTUrHquFSGFwAGy76k35b/fLpiV5KS4y9fV2LCxaBPzvEsWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=8e4ef1c3a3d93811b65be448fb4650786a66a430 commit 8e4ef1c3a3d93811b65be448fb4650786a66a430 Author: Edward Tomasz Napierala AuthorDate: 2021-04-16 07:52:59 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 21:06:37 +0000 linux: make fstatat(2) handle AT_EMPTY_PATH Without it, Qt5 apps from Focal fail to start, being unable to load their plugins. It's also necessary for glibc 2.33, as found in recent Arch snapshots. PR: 254112 Reviewed By: kib Sponsored by: The FreeBSD Foundation, EPSRC Differential Revision: https://reviews.freebsd.org/D28192 (cherry picked from commit 4b45c2bb83a1d7aded0c424d65595cc576760dc7) --- sys/compat/linux/linux_stats.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 01f9cada670b..c88f6f53bdd7 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -632,10 +632,14 @@ linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) int error, dfd, flag; struct stat buf; - if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) + if (args->flag & ~(LINUX_AT_SYMLINK_NOFOLLOW | LINUX_AT_EMPTY_PATH)) { + linux_msg(td, "fstatat64 unsupported flag 0x%x", args->flag); return (EINVAL); + } flag = (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) ? AT_SYMLINK_NOFOLLOW : 0; + flag |= (args->flag & LINUX_AT_EMPTY_PATH) ? + AT_EMPTY_PATH : 0; dfd = (args->dfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->dfd; if (!LUSECONVPATH(td)) { @@ -661,10 +665,15 @@ linux_newfstatat(struct thread *td, struct linux_newfstatat_args *args) int error, dfd, flag; struct stat buf; - if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) + if (args->flag & ~(LINUX_AT_SYMLINK_NOFOLLOW | LINUX_AT_EMPTY_PATH)) { + linux_msg(td, "fstatat unsupported flag 0x%x", args->flag); return (EINVAL); + } + flag = (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) ? AT_SYMLINK_NOFOLLOW : 0; + flag |= (args->flag & LINUX_AT_EMPTY_PATH) ? + AT_EMPTY_PATH : 0; dfd = (args->dfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->dfd; if (!LUSECONVPATH(td)) {