r6807 - in glibc-package/branches/glibc-2.22/debian: . patches patches/any
Author: aurel32
Date: 2015-12-11 17:14:15 +0000 (Fri, 11 Dec 2015)
New Revision: 6807
Removed:
glibc-package/branches/glibc-2.22/debian/patches/any/local-no-malloc-backtrace.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/local-no-malloc-backtrace.diff: drop, the real bug
has been fixed upstream.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-11 17:12:13 UTC (rev 6806)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-11 17:14:15 UTC (rev 6807)
@@ -6,6 +6,8 @@
lot of time, obsolete.
* debian/patches/sparc/submitted-timing.diff: drop, obsolete, not
needed anymore since libc6-sparcv9 has been removed.
+ * debian/patches/any/local-no-malloc-backtrace.diff: drop, the real bug
+ has been fixed upstream.
-- Aurelien Jarno <aurel32@debian.org> Thu, 10 Dec 2015 23:41:13 +0100
Deleted: glibc-package/branches/glibc-2.22/debian/patches/any/local-no-malloc-backtrace.diff
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/any/local-no-malloc-backtrace.diff 2015-12-11 17:12:13 UTC (rev 6806)
+++ glibc-package/branches/glibc-2.22/debian/patches/any/local-no-malloc-backtrace.diff 2015-12-11 17:14:15 UTC (rev 6807)
@@ -1,66 +0,0 @@
-Description: disable backtraces on malloc errors
-Author: Steve Beattie <sbeattie@ubuntu.com>
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16159
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1266492
-Forwarded: no, needs testing first
-
-Disable backtraces by default when malloc internal errors have
-occurred; backtraces end up calling malloc themselves which causes a
-deadlock on the internal glibc malloc lock. It's also a bad idea to use
-malloc if an attacker has corrupted malloc's internal data structures.
-We do this by setting the default for MALLOC_CHECK_ to 1 and converting
-the first argument to __libc_message to equal 'action & 3':
- if action = 1, __libc_message aborts
- if action > 1, __libc_message aborts w/backtrace (on linux)
-Previously, setting MALLOC_CHECK_ to 1 would not abort.
-
-MALLOC_CHECK_ is also added to the list of environment variables to
-filter for setuid binaries.
-
-For debugging purposes, people can manually add MALLOC_CHECK_=3 to their
-environment to get the backtracing behavior back.
----
- malloc/malloc.c | 9 +++++++--
- sysdeps/generic/unsecvars.h | 1 +
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-Index: b/malloc/malloc.c
-===================================================================
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -1842,8 +1842,11 @@ void weak_variable (*__after_morecore_ho
-
- /* ---------------- Error behavior ------------------------------------ */
-
-+
-+/* we don't want to emit a backtrace on error, see
-+ https://sourceware.org/bugzilla/show_bug.cgi?id=16159, so set to 1 */
- #ifndef DEFAULT_CHECK_ACTION
--# define DEFAULT_CHECK_ACTION 3
-+# define DEFAULT_CHECK_ACTION 1
- #endif
-
- static int check_action = DEFAULT_CHECK_ACTION;
-@@ -4988,7 +4991,9 @@ malloc_printerr (int action, const char
- while (cp > buf)
- *--cp = '0';
-
-- __libc_message (action & 2, "*** Error in `%s': %s: 0x%s ***\n",
-+ /* always abort (action & 1) and (on linux) if bit 1 is set,
-+ emit backtrace */
-+ __libc_message (action & 3, "*** Error in `%s': %s: 0x%s ***\n",
- __libc_argv[0] ? : "<unknown>", str, cp);
- }
- else if (action & 2)
-Index: b/sysdeps/generic/unsecvars.h
-===================================================================
---- a/sysdeps/generic/unsecvars.h
-+++ b/sysdeps/generic/unsecvars.h
-@@ -17,6 +17,7 @@
- "LD_USE_LOAD_BIAS\0" \
- "LOCALDOMAIN\0" \
- "LOCPATH\0" \
-+ "MALLOC_CHECK_\0" \
- "MALLOC_TRACE\0" \
- "NIS_PATH\0" \
- "NLSPATH\0" \
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-11 17:12:13 UTC (rev 6806)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-11 17:14:15 UTC (rev 6807)
@@ -231,7 +231,6 @@
any/unsubmitted-dlopen-static-crash.diff
any/unsubmitted-scanf-includes.diff
any/local-ldconfig-ignore-ld.so.diff
-any/local-no-malloc-backtrace.diff
any/local-dynamic-resolvconf.diff
any/local-libpic.diff
any/local-bootstrap-headers.diff
Reply to: