From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 9550 invoked from network); 16 Feb 2021 17:30:44 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 16 Feb 2021 17:30:44 -0000 Received: (qmail 24350 invoked by uid 550); 16 Feb 2021 17:30:40 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 24317 invoked from network); 16 Feb 2021 17:30:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QmmtByV6ev+xOByfOzlewYBIFtB8F9vab2P+zCOj9ho=; b=HwDAYhqGtlhn8YZd5NnEYREaNf8slLNrXpPZ/wZCUBNPv1yJD2BuPAqF1TI7lUDreM mIgGRYGZVJhxu2wS1xIEpAVTVZG35Q3lnpC7saGgHmoUwhJ0xSQXfAGPzfpqddQ7E8sT cQc1q3rwqKNnaoB2y4sGklp+ZM1WOuEkXSu4wXLIr15tp75VfHrvDh8fBftkOD2myc/I UOf9RMslTgMfgupTXhVdt/Vy0981THVloYInlqh/QleTJDqLYvjyVhF5FcLY9ZUOnhxu Od8zXRCZJP3Pg1VhepbGEjNPeDQ6b3oj1yh6zWVBGfocaNg6XjwpFSzalBEKa+gBfdoi H3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QmmtByV6ev+xOByfOzlewYBIFtB8F9vab2P+zCOj9ho=; b=sDf+sNO/JCAjXsfYqXxTNMdOf1OHQPm+vu1AqAg+6dD2knwifJYcd5Zw1a3pp62Pbo 4CwM1JssponO9dUkEb+Z0Yel/HmQYtvWzFjqhmZ+NraYiNgiHwHX2i0DFSxsKCejM2f2 CXC9hNzFYcGX+bDTBLMtkuyjoxK+VF99Uum9jl4JJjGt5u/7x+gB08RospEMjFlEwwTU o8iZ/QGJz6/5e078Cq+OJvNGVdk/J0JvNUYALgJQBqS1FEula3o5oVX2//h2J7I0vmy7 t+pjGIXQD9RDzBYWdGbv/VJyTvMJEzDLUlycLJP0o3Br1X3IcpOkvq3bW/7WTwJeokEU ZERA== X-Gm-Message-State: AOAM532AIYAGekCixeq69Arjm9LRvit5UFE6wxsr40TrkruLqUEbywkH LZXVWeZsq1v38/MzBzBYkX+z5pWtQK0Jgw== X-Google-Smtp-Source: ABdhPJyjc8vniXBqHgD2+/V0MVyQ2SV7OxyGkz9039qj8+1caZ41fCuEOdZhnmOLL3VPHrRfkvxr3Q== X-Received: by 2002:a63:4458:: with SMTP id t24mr18821972pgk.173.1613496626296; Tue, 16 Feb 2021 09:30:26 -0800 (PST) From: Khem Raj To: musl@lists.openwall.com Cc: dalias@libc.org, Richard Purdie , Khem Raj Date: Tue, 16 Feb 2021 09:30:22 -0800 Message-Id: <20210216173022.759116-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH] handle AT_SYMLINK_NOFOLLOW From: Richard Purdie For faccessat(), AT_SYMLINK_NOFOLLOW is a supported flag by the Linux kernel and musl should really handle it correctly rather than return EINVAL. Noticed from code in systemd. Signed-off-by: Richard Purdie Signed-off-by: Khem Raj --- src/unistd/faccessat.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/unistd/faccessat.c b/src/unistd/faccessat.c index 8e8689c1..22c30bc6 100644 --- a/src/unistd/faccessat.c +++ b/src/unistd/faccessat.c @@ -9,6 +9,7 @@ struct ctx { const char *filename; int amode; int p; + int flag; }; static int checker(void *p) @@ -18,7 +19,7 @@ static int checker(void *p) if (__syscall(SYS_setregid, __syscall(SYS_getegid), -1) || __syscall(SYS_setreuid, __syscall(SYS_geteuid), -1)) __syscall(SYS_exit, 1); - ret = __syscall(SYS_faccessat, c->fd, c->filename, c->amode, 0); + ret = __syscall(SYS_faccessat, c->fd, c->filename, c->amode, c->flag & AT_SYMLINK_NOFOLLOW); __syscall(SYS_write, c->p, &ret, sizeof ret); return 0; } @@ -30,11 +31,11 @@ int faccessat(int fd, const char *filename, int amode, int flag) if (ret != -ENOSYS) return __syscall_ret(ret); } - if (flag & ~AT_EACCESS) + if (flag & ~(AT_EACCESS | AT_SYMLINK_NOFOLLOW)) return __syscall_ret(-EINVAL); - if (!flag || (getuid()==geteuid() && getgid()==getegid())) - return syscall(SYS_faccessat, fd, filename, amode); + if (!(flag & AT_EACCESS) || (getuid()==geteuid() && getgid()==getegid())) + return syscall(SYS_faccessat, fd, filename, amode, flag); char stack[1024]; sigset_t set; @@ -42,7 +43,7 @@ int faccessat(int fd, const char *filename, int amode, int flag) int ret, p[2]; if (pipe2(p, O_CLOEXEC)) return __syscall_ret(-EBUSY); - struct ctx c = { .fd = fd, .filename = filename, .amode = amode, .p = p[1] }; + struct ctx c = { .fd = fd, .filename = filename, .amode = amode, .p = p[1], .flag=flag }; __block_all_sigs(&set); -- 2.30.1