summary refs log tree commit diff
path: root/libio
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-11-22 22:10:42 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-11-27 20:16:22 +0100
commitcb61630ed712d033f54295f776967532d3f4b46a (patch)
tree0339f32c55367e2b539f6e4f6c578110e4146da6 /libio
parent381b76d7a3511e152675018457bd432fa2657928 (diff)
downloadglibc-cb61630ed712d033f54295f776967532d3f4b46a.tar.gz
glibc-cb61630ed712d033f54295f776967532d3f4b46a.tar.xz
glibc-cb61630ed712d033f54295f776967532d3f4b46a.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
Diffstat (limited to 'libio')
-rw-r--r--libio/oldstdfiles.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libio/oldstdfiles.c b/libio/oldstdfiles.c
index bb1705b7b2..95c041a632 100644
--- a/libio/oldstdfiles.c
+++ b/libio/oldstdfiles.c
@@ -83,6 +83,11 @@ _IO_check_libio (void)
 	= 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);
     }
 }