* sysdeps/i386/i586/memcpy.S (__memcpy_chk): New definition.

	* sysdeps/i386/i586/mempcpy.S (__memcpy_chk): New definition.
	* sysdeps/i386/i586/memset.S (__memset_chk): New definition.

diff --git a/ChangeLog b/ChangeLog
index 29e1293c0fa86076e716c225ce8aa82dbd2c046f..b27b3e53cc7b305469ca2f2d798f7151d17869e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * sysdeps/i386/i586/memcpy.S (__memcpy_chk): New definition.
+       * sysdeps/i386/i586/mempcpy.S (__memcpy_chk): New definition.
+       * sysdeps/i386/i586/memset.S (__memset_chk): New definition.
+
 2007-09-15  Mike Frysinger  <vapier@gentoo.org>
 
        * inet/inet_net.c: Reset digit to 0 for inputs starting with "0x".

diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S
index 6ab457fc556d8451fac8f7b00f442fb7db549a51..677a7e6204197164f47e9b8ec31709ed351e439c 100644 (file)
--- a/sysdeps/i386/i586/memcpy.S
+++ b/sysdeps/i386/i586/memcpy.S
@@ -35,6 +35,13 @@
 #define LEN    SRC+PTR_SIZE
 
         .text
+#if defined PIC && !defined NOT_IN_libc
+ENTRY (__memcpy_chk)
+       movl    12(%esp), %eax
+       cmpl    %eax, 16(%esp)
+       jb      HIDDEN_JUMPTARGET (__chk_fail)
+END (__memcpy_chk)
+#endif
 ENTRY (BP_SYM (memcpy))
        ENTER
 

diff --git a/sysdeps/i386/i586/mempcpy.S b/sysdeps/i386/i586/mempcpy.S
index 0c9520e3b4912ca07e7d885f000ffac0001131cc..f492be7ca072283988846ee87a221bc5cfef9409 100644 (file)
--- a/sysdeps/i386/i586/mempcpy.S
+++ b/sysdeps/i386/i586/mempcpy.S
@@ -1,4 +1,5 @@
 #define memcpy __mempcpy
+#define __memcpy_chk __mempcpy_chk
 #include <sysdeps/i386/i586/memcpy.S>
 
 libc_hidden_def (BP_SYM (__mempcpy))

diff --git a/sysdeps/i386/i586/memset.S b/sysdeps/i386/i586/memset.S
index c21e9f7a718c21bbff1062553da6dc8b478b65b8..3295b48e718b55f288a7b630575bb514edc7069d 100644 (file)
--- a/sysdeps/i386/i586/memset.S
+++ b/sysdeps/i386/i586/memset.S
@@ -38,6 +38,13 @@
 #endif
 
         .text
+#if defined PIC && !defined NOT_IN_libc && !BZERO_P
+ENTRY (__memset_chk)
+       movl    12(%esp), %eax
+       cmpl    %eax, 16(%esp)
+       jb      HIDDEN_JUMPTARGET (__chk_fail)
+END (__memset_chk)
+#endif
 ENTRY (BP_SYM (memset))
        ENTER