diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-03-25 15:34:53 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-03-25 10:06:03 -0600 |
| commit | 9e75ad5d8f399a21c86271571aa630dd080223e2 (patch) | |
| tree | 6928ca0e842d8421e4cf2323e4403be71b22c7b0 /fs/io_uring.c | |
| parent | 85fae294e1a506b4213668716acb586bd6b4ae1e (diff) | |
| download | linux-9e75ad5d8f399a21c86271571aa630dd080223e2.tar.gz | |
io_uring: fix big-endian compat signal mask handling
On big-endian architectures, the signal masks are differnet between 32-bit and 64-bit tasks, so we have to use a different function for reading them from user space. io_cqring_wait() initially got this wrong, and always interprets this as a native structure. This is ok on x86 and most arm64, but not on s390, ppc64be, mips64be, sparc64 and parisc. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 6aaa30580a2b..8f48d29abf76 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1968,7 +1968,15 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, return 0; if (sig) { - ret = set_user_sigmask(sig, &ksigmask, &sigsaved, sigsz); +#ifdef CONFIG_COMPAT + if (in_compat_syscall()) + ret = set_compat_user_sigmask((const compat_sigset_t __user *)sig, + &ksigmask, &sigsaved, sigsz); + else +#endif + ret = set_user_sigmask(sig, &ksigmask, + &sigsaved, sigsz); + if (ret) return ret; } |