[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Tue, 16 Feb 2021 09:30:22 -0800
From: Khem Raj <raj.khem@...il.com>
To: musl@...ts.openwall.com
Cc: dalias@...c.org,
Richard Purdie <richard.purdie@...uxfoundation.org>,
Khem Raj <raj.khem@...il.com>
Subject: [PATCH] handle AT_SYMLINK_NOFOLLOW
From: Richard Purdie <richard.purdie@...uxfoundation.org>
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 <richard.purdie@...uxfoundation.org>
Signed-off-by: Khem Raj <raj.khem@...il.com>
---
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
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
