diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-11-28 14:17:27 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-11-28 14:17:27 +0100 |
| commit | 44a61d4589880be014c5c5c522b6afba8d63625b (patch) | |
| tree | 0a040af3ca3a10e2175c15f21bea40053096069d | |
| parent | 5422ac2d08dec91d4eb61d20b5e4b121500a4b88 (diff) | |
| download | glibc-44a61d4589880be014c5c5c522b6afba8d63625b.tar.gz glibc-44a61d4589880be014c5c5c522b6afba8d63625b.tar.xz glibc-44a61d4589880be014c5c5c522b6afba8d63625b.zip | |
libio: Disable vtable validation for pre-2.1 interposed handles [BZ #25203]
Commit c402355dfa7807b8e0adb27c009135a7e2b9f1b0 ("libio: Disable
vtable validation in case of interposition [BZ #23313]") only covered
the interposable glibc 2.1 handles, in libio/stdfiles.c. The
parallel code in libio/oldstdfiles.c needs similar detection logic.
Fixes (again) commit db3476aff19b75c4fdefbe65fcd5f0a90588ba51
("libio: Implement vtable verification [BZ #20191]").
Change-Id: Ief6f9f17e91d1f7263421c56a7dc018f4f595c21
(cherry picked from commit cb61630ed712d033f54295f776967532d3f4b46a)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | libio/oldstdfiles.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS index 6b3f4e0776..aabea18307 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,7 @@ The following bugs are resolved with this release: [24744] io: Remove the copy_file_range emulation [24986] alpha: new getegid, geteuid and getppid syscalls used unconditionally + [25203] libio: Disable vtable validation for pre-2.1 interposed handles [25204] Ignore LD_PREFER_MAP_32BIT_EXEC for SUID programs Security related changes: diff --git a/libio/oldstdfiles.c b/libio/oldstdfiles.c index 524e260b7e..5d6a87d88a 100644 --- a/libio/oldstdfiles.c +++ b/libio/oldstdfiles.c @@ -87,6 +87,11 @@ _IO_check_libio (void) stdout->_vtable_offset = stderr->_vtable_offset = ((int) sizeof (struct _IO_FILE) - (int) sizeof (struct _IO_FILE_complete)); + + if (_IO_stdin_.vtable != &_IO_old_file_jumps + || _IO_stdout_.vtable != &_IO_old_file_jumps + || _IO_stderr_.vtable != &_IO_old_file_jumps) + IO_set_accept_foreign_vtables (&_IO_vtable_check); } } |