This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/cet/master updated. glibc-2.26.9000-988-g4f729be
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Dec 2017 12:42:56 -0000
- Subject: GNU C Library master sources branch hjl/cet/master updated. glibc-2.26.9000-988-g4f729be
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/cet/master has been updated
via 4f729be2aa3bdcec4c7f24c9f813d022b4424f1b (commit)
from 58722f9999c591122ec64f40885c55d8c210a549 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4f729be2aa3bdcec4c7f24c9f813d022b4424f1b
commit 4f729be2aa3bdcec4c7f24c9f813d022b4424f1b
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Dec 15 04:38:00 2017 -0800
The shift for i386 should by 2, not by 3
diff --git a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
index 63ccd27..3c2d94e 100644
--- a/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+++ b/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
@@ -64,7 +64,7 @@ ENTRY (____longjmp_chk)
the ssp by [0..255] value only thus use a loop if
the number of frames is bigger than 255. */
negl %edx
- shrl $3, %edx
+ shrl $2, %edx
/* NB: We saved Shadow-Stack-Pointer of setjmp. Since we are
restoring Shadow-Stack-Pointer of setjmp's caller, we
need to unwind shadow stack by one more frame. */
diff --git a/sysdeps/unix/sysv/linux/i386/__longjmp.S b/sysdeps/unix/sysv/linux/i386/__longjmp.S
index c8377a4..c41dac1 100644
--- a/sysdeps/unix/sysv/linux/i386/__longjmp.S
+++ b/sysdeps/unix/sysv/linux/i386/__longjmp.S
@@ -45,7 +45,7 @@ ENTRY (__longjmp)
the ssp by [0..255] value only thus use a loop if
the number of frames is bigger than 255. */
negl %ecx
- shrl $3, %ecx
+ shrl $2, %ecx
/* NB: We saved Shadow-Stack-Pointer of setjmp. Since we are
restoring Shadow-Stack-Pointer of setjmp's caller, we
need to unwind shadow stack by one more frame. */
-----------------------------------------------------------------------
Summary of changes:
sysdeps/unix/sysv/linux/i386/____longjmp_chk.S | 2 +-
sysdeps/unix/sysv/linux/i386/__longjmp.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources