r6017 - in glibc-package/branches/eglibc-2.19/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2014-04-16 21:21:57 +0000 (Wed, 16 Apr 2014)
New Revision: 6017
Added:
glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-munmap-0.diff
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/patches/series
Log:
backport r6016 from 2.18: hurd-i386/cvs-munmap-0.diff: New patch to fix gcc's -fsplit-stack initialization
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-04-16 21:21:09 UTC (rev 6016)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-04-16 21:21:57 UTC (rev 6017)
@@ -86,6 +86,8 @@
* patches/hurd-i386/libpthread_nort.diff: Remove patch, replaced by...
* patches/hurd-i386/cvs-libpthread-pthread_condattr_setclock.diff: Fix for
pthread_condattr_setclock, for glib2.0 build.
+ * patches/hurd-i386/cvs-munmap-0.diff: New patch to fix gcc's -fsplit-stack
+ initialization.
-- Aurelien Jarno <aurel32@debian.org> Sun, 02 Mar 2014 16:19:49 +0100
Copied: glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-munmap-0.diff (from rev 6016, glibc-package/trunk/debian/patches/hurd-i386/cvs-munmap-0.diff)
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-munmap-0.diff (rev 0)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/cvs-munmap-0.diff 2014-04-16 21:21:57 UTC (rev 6017)
@@ -0,0 +1,26 @@
+commit fd15a59b20220a2d89d628ecebfcaad1ddefe871
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Wed Apr 16 23:16:15 2014 +0200
+
+ hurd: Do not allow unmapping address 0
+
+ * sysdeps/mach/munmap.c (__munmap): Return EINVAL if `addr' is 0.
+
+diff --git a/sysdeps/mach/munmap.c b/sysdeps/mach/munmap.c
+index f8c416f..cfd5daa 100644
+--- a/sysdeps/mach/munmap.c
++++ b/sysdeps/mach/munmap.c
+@@ -27,6 +27,13 @@ int
+ __munmap (__ptr_t addr, size_t len)
+ {
+ kern_return_t err;
++
++ if (addr == 0)
++ {
++ errno = EINVAL;
++ return -1;
++ }
++
+ if (err = __vm_deallocate (__mach_task_self (),
+ (vm_address_t) addr, (vm_size_t) len))
+ {
Modified: glibc-package/branches/eglibc-2.19/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/series 2014-04-16 21:21:09 UTC (rev 6016)
+++ glibc-package/branches/eglibc-2.19/debian/patches/series 2014-04-16 21:21:57 UTC (rev 6017)
@@ -128,6 +128,7 @@
hurd-i386/tg-sigstate_thread_reference.diff
hurd-i386/tg-tls_thread_leak.diff
hurd-i386/tg-mmap_file_prot_none_fix.diff
+hurd-i386/cvs-munmap-0.diff
i386/local-biarch.diff
i386/local-cmov.diff
Reply to: