diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-12 17:34:11 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-12 17:34:11 +0000 |
| commit | 9714012ca015f1f6763f66bd74d6f3f9e1512b36 (patch) | |
| tree | 418f7f2316fdce01a1e14b2dd19f2df91c2ea0e4 /sysdeps | |
| parent | 498c1f6a7c7f7b634d02e740f15789cf68820a54 (diff) | |
| download | glibc-9714012ca015f1f6763f66bd74d6f3f9e1512b36.tar glibc-9714012ca015f1f6763f66bd74d6f3f9e1512b36.tar.gz glibc-9714012ca015f1f6763f66bd74d6f3f9e1512b36.tar.bz2 glibc-9714012ca015f1f6763f66bd74d6f3f9e1512b36.zip | |
Fix aio_* pread namespace (bug 18519).
aio_* bring in references to pread, which isn't in all the standards
containing aio_* (as a reference from one library to another, this is
a bug for dynamic as well as static linking). This patch fixes this
by using __libc_pread instead, exporting that function from libc at
symbol version GLIBC_PRIVATE; the code, with conditionals that may
call either __pread64 or __libc_pread, becomes exactly analogous to
that elsewhere in the same file that may call either __pwrite64 or
__libc_pwrite.
Tested for x86_64 and x86 (testsuite, and comparison of disassembly of
installed shared libraries). libc changes because of the PLT entry
for the newly exported __libc_pread; librt changes because of
assertion line numbers and PLT rearrangement; other stripped installed
shared libraries do not change.
[BZ #18519]
* posix/Versions (libc): Export __libc_pread at version
GLIBC_PRIVATE.
* sysdeps/pthread/aio_misc.c (handle_fildes_io): Call __libc_pread
instead of pread.
* conform/Makefile (test-xfail-POSIX/aio.h/linknamespace): Remove
variable.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/pthread/aio_misc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c index 83a6cb951d..d9740d7ebe 100644 --- a/sysdeps/pthread/aio_misc.c +++ b/sysdeps/pthread/aio_misc.c @@ -536,10 +536,11 @@ handle_fildes_io (void *arg) aiocbp->aiocb64.aio_offset)); else aiocbp->aiocb.__return_value = - TEMP_FAILURE_RETRY (pread (fildes, - (void *) aiocbp->aiocb.aio_buf, - aiocbp->aiocb.aio_nbytes, - aiocbp->aiocb.aio_offset)); + TEMP_FAILURE_RETRY (__libc_pread (fildes, + (void *) + aiocbp->aiocb.aio_buf, + aiocbp->aiocb.aio_nbytes, + aiocbp->aiocb.aio_offset)); if (aiocbp->aiocb.__return_value == -1 && errno == ESPIPE) /* The Linux kernel is different from others. It returns |