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)

diff --git a/NEWS b/NEWS
index 6b3f4e077601063290e3a14c7a5911f9d4c24296..aabea1830720f6cc0fcb8488ade0e9987aa7341c 100644 (file)
--- 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 524e260b7eb6f3c63e329e215146ffd1ac669057..5d6a87d88a67c54efc9911e2a40d2c49a6aa3c5d 100644 (file)
--- 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);
     }
 }