Skip to content

Commit cc4b124

Browse files
aurel32Al Viro
authored and
Al Viro
committed
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 <[email protected]> Cc: H.J. Lu <[email protected]> Signed-off-by: Aurelien Jarno <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 01e7187 commit cc4b124

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Diff for: fs/read_write.c

+6
Original file line numberDiff line numberDiff line change
@@ -1238,6 +1238,9 @@ COMPAT_SYSCALL_DEFINE5(preadv64v2, unsigned long, fd,
12381238
const struct compat_iovec __user *,vec,
12391239
unsigned long, vlen, loff_t, pos, rwf_t, flags)
12401240
{
1241+
if (pos == -1)
1242+
return do_compat_readv(fd, vec, vlen, flags);
1243+
12411244
return do_compat_preadv64(fd, vec, vlen, pos, flags);
12421245
}
12431246
#endif
@@ -1344,6 +1347,9 @@ COMPAT_SYSCALL_DEFINE5(pwritev64v2, unsigned long, fd,
13441347
const struct compat_iovec __user *,vec,
13451348
unsigned long, vlen, loff_t, pos, rwf_t, flags)
13461349
{
1350+
if (pos == -1)
1351+
return do_compat_writev(fd, vec, vlen, flags);
1352+
13471353
return do_compat_pwritev64(fd, vec, vlen, pos, flags);
13481354
}
13491355
#endif

0 commit comments

Comments
 (0)