[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181206190534.16246-1-aurelien@aurel32.net>
Date: Thu, 6 Dec 2018 20:05:34 +0100
From: Aurelien Jarno <aurelien@...el32.net>
To: linux-kernel@...r.kernel.org
Cc: linux-fsdevel@...r.kernel.org, x86@...nel.org,
Aurelien Jarno <aurelien@...el32.net>,
Alexander Viro <viro@...iv.linux.org.uk>,
"H . J . Lu" <hjl.tools@...il.com>
Subject: [PATCH] vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
The preadv2 and pwritev2 syscalls are supposed to emulate the readv and
writev syscalls when offset == -1. Therefore the compat code should
check for offset before calling do_compat_preadv64 and
do_compat_pwritev64. This is the case for the preadv2 and pwritev2
syscalls, but handling of offset == -1 is missing in their 64-bit
equivalent.
This patch fixes that, calling do_compat_readv and do_compat_writev when
offset == -1. This fixes the following glibc tests on x32:
- misc/tst-preadvwritev2
- misc/tst-preadvwritev64v2
Cc: Alexander Viro <viro@...iv.linux.org.uk>
Cc: H.J. Lu <hjl.tools@...il.com>
Signed-off-by: Aurelien Jarno <aurelien@...el32.net>
---
fs/read_write.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/fs/read_write.c b/fs/read_write.c
index 4dae0399c75a..c2dd3737fea2 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1241,6 +1241,9 @@ COMPAT_SYSCALL_DEFINE5(preadv64v2, unsigned long, fd,
const struct compat_iovec __user *,vec,
unsigned long, vlen, loff_t, pos, rwf_t, flags)
{
+ if (pos == -1)
+ return do_compat_readv(fd, vec, vlen, flags);
+
return do_compat_preadv64(fd, vec, vlen, pos, flags);
}
#endif
@@ -1347,6 +1350,9 @@ COMPAT_SYSCALL_DEFINE5(pwritev64v2, unsigned long, fd,
const struct compat_iovec __user *,vec,
unsigned long, vlen, loff_t, pos, rwf_t, flags)
{
+ if (pos == -1)
+ return do_compat_writev(fd, vec, vlen, flags);
+
return do_compat_pwritev64(fd, vec, vlen, pos, flags);
}
#endif
--
2.19.1
Powered by blists - more mailing lists