diff options
author | Joseph Myers <joseph@codesourcery.com> | 2017-01-02 23:09:25 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2017-01-02 23:09:25 +0000 |
commit | df19fdcfec7143073b50f9f01af712528bed6d26 (patch) | |
tree | 7ac8e62677421e81fceaa7b5a2499887a8663338 /io | |
parent | 4179178bf0cfafe72c00647b79e69e47bd5c6a89 (diff) | |
download | glibc-df19fdcfec7143073b50f9f01af712528bed6d26.zip glibc-df19fdcfec7143073b50f9f01af712528bed6d26.tar.gz glibc-df19fdcfec7143073b50f9f01af712528bed6d26.tar.bz2 |
Fix MIPS n32 lseek, lseek64 (bug 21019).
The lseek consolidation broke lseek64 for MIPS n32, so resulting in
io/test-lfs failing with an incorrect return from ftello64. This
configuration uses the lseek syscall with a 64-bit return value; as
the C syscall macros return long, they cannot be used in this case and
so an assembly implementation is needed; accordingly, this patch adds
lseek64 back to syscalls.list for this configuration.
lseek was also broken, truncating the result without checking for
overflow. lseek however was already broken before the consolidation;
it aliased lseek64 so would return an out-of-range value, resulting in
architecturally undefined behavior in the caller if it tried to use a
non-sign-extended value with a 32-bit instruction. This patch adds a
custom lseek implementation in C for n32, which calls __lseek64 to get
the 64-bit value then checks for overflow.
Because the prior lseek breakage did not show in test results, and the
lseek64 breakage showed only indirectly through tests of ftello64,
test coverage was clearly inadequate. This patch extends
io/test-lfs.c to test the lseek64 return value (at a point where it
has already seeked over 2GB into a file), and then to test the lseek
return value (with the latter's expectations depending on whether
off_t is smaller than off64_t).
Tested for mips64 n32. Also tested test-lfs for x86_64 and x86, where
as expected it passes.
[BZ #21019]
* sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list (lseek64):
New syscall entry.
* sysdeps/unix/sysv/linux/mips/mips64/n32/lseek.c: New file.
* io/test-lfs.c (do_test): Test offset returned from lseek64 and
lseek.
Diffstat (limited to 'io')
-rw-r--r-- | io/test-lfs.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/io/test-lfs.c b/io/test-lfs.c index 5d976c7..1477354 100644 --- a/io/test-lfs.c +++ b/io/test-lfs.c @@ -163,6 +163,27 @@ do_test (int argc, char *argv[]) error (0, errno, "lseek64 failed with error"); exit (EXIT_FAILURE); } + off64_t offset64 = lseek64 (fd, 0, SEEK_CUR); + if (offset64 != TWO_GB + 100) + { + error (0, 0, "lseek64 did not return expected offset"); + exit (EXIT_FAILURE); + } + off_t offset = lseek (fd, 0, SEEK_CUR); + if (sizeof (off_t) < sizeof (off64_t)) + { + if (offset != -1 || errno != EOVERFLOW) + { + error (0, 0, "lseek did not fail with EOVERFLOW"); + exit (EXIT_FAILURE); + } + } + else + if (offset != TWO_GB + 100) + { + error (0, 0, "lseek did not return expected offset"); + exit (EXIT_FAILURE); + } ret = write (fd, "Hello", 5); if (ret == -1 && errno == EFBIG) |