From 3a8b473f58ea1c97ebc46dbbda0abde595777524 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Sat, 4 Jun 2016 14:51:52 +0200 Subject: drop old patch series --- debian/patches/leaks0001-xxx-print-fail.patch | 47 ------ ...uldbeinlibc-add-safe-port-handling-macros.patch | 187 --------------------- debian/patches/series | 2 - 3 files changed, 236 deletions(-) delete mode 100644 debian/patches/leaks0001-xxx-print-fail.patch delete mode 100644 debian/patches/leaks0002-libshouldbeinlibc-add-safe-port-handling-macros.patch diff --git a/debian/patches/leaks0001-xxx-print-fail.patch b/debian/patches/leaks0001-xxx-print-fail.patch deleted file mode 100644 index de9fc0ed..00000000 --- a/debian/patches/leaks0001-xxx-print-fail.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6f7a1ab15d87b9d47e5d05c0b473c7e645385afe Mon Sep 17 00:00:00 2001 -From: Justus Winter -Date: Sat, 4 Jun 2016 04:40:44 +0200 -Subject: [PATCH hurd 1/2] xxx print fail - ---- - libshouldbeinlibc/assert-backtrace.c | 8 ++++++++ - libshouldbeinlibc/assert-backtrace.h | 6 ++++++ - 2 files changed, 14 insertions(+) - -diff --git a/libshouldbeinlibc/assert-backtrace.c b/libshouldbeinlibc/assert-backtrace.c -index ca23c8d..72a49e9 100644 ---- a/libshouldbeinlibc/assert-backtrace.c -+++ b/libshouldbeinlibc/assert-backtrace.c -@@ -76,4 +76,12 @@ __assert_perror_fail_backtrace (int errnum, - - } - -+void -+__print_fail_backtrace (const char *message, const char *file, -+ unsigned int line, const char *function) -+{ -+ __assert_fail_base_backtrace ("%s: %s:%u: %s: %s.\n", -+ message, file, line, function); -+} -+ - #endif /* ! defined NDEBUG */ -diff --git a/libshouldbeinlibc/assert-backtrace.h b/libshouldbeinlibc/assert-backtrace.h -index c54b810..b36e5b2 100644 ---- a/libshouldbeinlibc/assert-backtrace.h -+++ b/libshouldbeinlibc/assert-backtrace.h -@@ -42,6 +42,12 @@ void __assert_perror_fail_backtrace (int errnum, - const char *function) - __attribute__ ((noreturn, unused)); - -+/* Likewise, but prints the given MESSAGE. */ -+void -+__print_fail_backtrace (const char *message, const char *file, -+ unsigned int line, const char *function) -+ __attribute__ ((noreturn, unused)); -+ - #define assert_backtrace(expr) \ - ((expr) \ - ? (void) 0 \ --- -2.1.4 - diff --git a/debian/patches/leaks0002-libshouldbeinlibc-add-safe-port-handling-macros.patch b/debian/patches/leaks0002-libshouldbeinlibc-add-safe-port-handling-macros.patch deleted file mode 100644 index a5222f9c..00000000 --- a/debian/patches/leaks0002-libshouldbeinlibc-add-safe-port-handling-macros.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 1549bd825ef9b72d126b7dbd9996ab401fd4bd83 Mon Sep 17 00:00:00 2001 -From: Justus Winter -Date: Sat, 4 Jun 2016 00:55:48 +0200 -Subject: [PATCH hurd 2/2] libshouldbeinlibc: add safe port handling macros - -* libshouldbeinlibc/Makefile (SRCS, installhdrs): Add new file. -* libshouldbeinlibc/machx.h: New file. ---- - libshouldbeinlibc/Makefile | 2 ++ - libshouldbeinlibc/machx.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++ - trans/crash.c | 31 ++++++++++----------- - 3 files changed, 85 insertions(+), 15 deletions(-) - create mode 100644 libshouldbeinlibc/machx.h - -diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile -index 04c085b..76076f2 100644 ---- a/libshouldbeinlibc/Makefile -+++ b/libshouldbeinlibc/Makefile -@@ -30,11 +30,13 @@ SRCS = termsize.c timefmt.c exec-reauth.c maptime-funcs.c \ - ugids-verify-auth.c nullauth.c \ - refcount.c \ - assert-backtrace.c \ -+ machx.h \ - - installhdrs = idvec.h timefmt.h maptime.h \ - wire.h portinfo.h portxlate.h cacheq.h ugids.h nullauth.h \ - refcount.h \ - assert-backtrace.h \ -+ machx.h \ - - installhdrsubdir = . - -diff --git a/libshouldbeinlibc/machx.h b/libshouldbeinlibc/machx.h -new file mode 100644 -index 0000000..a4441cf ---- /dev/null -+++ b/libshouldbeinlibc/machx.h -@@ -0,0 +1,67 @@ -+/* Safe right handling routines. -+ -+ Copyright (C) 2016 Free Software Foundation, Inc. -+ -+ This file is part of the GNU Hurd. -+ -+ The GNU Hurd is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2, or (at -+ your option) any later version. -+ -+ The GNU Hurd is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with the GNU Hurd. If not, see . */ -+ -+#ifndef __MACHX__ -+#define __MACHX__ -+ -+#include -+#include -+#include -+ -+#define Mach_port_deallocate(TASK, NAME) \ -+ ({ \ -+ if (MACH_PORT_VALID (NAME)) \ -+ { \ -+ error_t _Xerr = mach_port_deallocate ((TASK), (NAME)); \ -+ assert_backtrace (! _Xerr || !"error deallocating "#NAME); \ -+ NAME = MACH_PORT_NULL; \ -+ } \ -+ }) -+ -+#define Mach_port_move(NAME) \ -+ ({ \ -+ mach_port_t _Xport = (NAME); \ -+ NAME = MACH_PORT_NULL; \ -+ _Xport; \ -+ }) -+ -+#define Mach_port_check(NAME) \ -+ void _Mach_port_check_##NAME(char *_unused[] __attribute__ ((unused))) \ -+ { \ -+ if (MACH_PORT_VALID (NAME)) \ -+ __assert_fail_backtrace (#NAME " leaked", \ -+ __FILE__, __LINE__, __PRETTY_FUNCTION__); \ -+ assert_backtrace (! MACH_PORT_VALID (NAME) || !"leaked" #NAME); \ -+ } \ -+ char _Mach_port_check_x_##NAME[0] \ -+ __attribute__ ((unused, cleanup (_Mach_port_check_##NAME))) -+ -+#define Mach_server_success() (err == 0 || err == MIG_NO_REPLY) -+ -+#define Mach_server_port_check(NAME) \ -+ void _Mach_port_check_##NAME(char *_unused[] __attribute__ ((unused))) \ -+ { \ -+ if (Mach_server_success () && MACH_PORT_VALID (NAME)) \ -+ __assert_fail_backtrace (#NAME " leaked", \ -+ __FILE__, __LINE__, __PRETTY_FUNCTION__); \ -+ } \ -+ char _Mach_port_check_x_##NAME[0] \ -+ __attribute__ ((unused, cleanup (_Mach_port_check_##NAME))) -+ -+#endif /* __MACHX__ */ -diff --git a/trans/crash.c b/trans/crash.c -index 9d93488..1037dce 100644 ---- a/trans/crash.c -+++ b/trans/crash.c -@@ -21,6 +21,7 @@ - along with the GNU Hurd; see the file COPYING. If not, write to - the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - -+#include - #include - #include - #include -@@ -250,8 +251,12 @@ S_crash_dump_task (mach_port_t port, - mach_port_t ctty_id) - { - error_t err; -+ Mach_server_port_check (task); -+ Mach_server_port_check (core_file); -+ Mach_server_port_check (ctty_id); - struct trivfs_protid *cred; - mach_port_t user_proc = MACH_PORT_NULL; -+ Mach_port_check (user_proc); - enum crash_action how; - - cred = ports_lookup_port (port_bucket, port, trivfs_protid_class); -@@ -303,7 +308,7 @@ S_crash_dump_task (mach_port_t port, - We will wait for signals to resume (crash) it. */ - msgport = ports_get_send_right (c); - err = proc_setmsgport (user_proc, msgport, &c->original_msgport); -- mach_port_deallocate (mach_task_self (), msgport); -+ Mach_port_deallocate (mach_task_self (), msgport); - - c->reply_port = reply_port; - c->reply_type = reply_type; -@@ -314,10 +319,8 @@ S_crash_dump_task (mach_port_t port, - /* Tell the proc server the crasher stopped. */ - proc_mark_stop (user_proc, signo, sigcode); - -- c->task = task; -- task = MACH_PORT_NULL; -- c->core_file = core_file; -- core_file = MACH_PORT_NULL; -+ c->task = Mach_port_move (task); -+ c->core_file = Mach_port_move (core_file); - c->core_limit = (off_t) -1; /* XXX should core limit in RPC */ - c->signo = signo; - c->sigcode = sigcode; -@@ -364,7 +367,7 @@ S_crash_dump_task (mach_port_t port, - - if (sink != core_file) - { -- mach_port_deallocate (mach_task_self (), sink); -+ Mach_port_deallocate (mach_task_self (), sink); - - /* We return an error so that the libc discards - CORE_FILE. */ -@@ -386,15 +389,13 @@ S_crash_dump_task (mach_port_t port, - } - } - -- if (user_proc != MACH_PORT_NULL) -- mach_port_deallocate (mach_task_self (), user_proc); -- if (! err && MACH_PORT_VALID (task)) -- mach_port_deallocate (mach_task_self (), task); -- if (! err && MACH_PORT_VALID (core_file)) -- mach_port_deallocate (mach_task_self (), core_file); -- if (! err && MACH_PORT_VALID (ctty_id)) -- mach_port_deallocate (mach_task_self (), ctty_id); -- -+ Mach_port_deallocate (mach_task_self (), user_proc); -+ if (Mach_server_success ()) -+ { -+ Mach_port_deallocate (mach_task_self (), task); -+ Mach_port_deallocate (mach_task_self (), core_file); -+ Mach_port_deallocate (mach_task_self (), ctty_id); -+ } - ports_port_deref (cred); - return err; - } --- -2.1.4 - diff --git a/debian/patches/series b/debian/patches/series index 296fd4ec..6afb65ce 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -40,7 +40,5 @@ hurdutil0001-libhurdutil-New-library-containing-utils-to-be-used-.patch external.patch crash0001-xxx-crash-logging-works.patch nfs0001-nfs-fix-memory-leak.patch -leaks0001-xxx-print-fail.patch -leaks0002-libshouldbeinlibc-add-safe-port-handling-macros.patch corefiles0001-trans-crash-fix-resource-leaks.patch corefiles0002-trans-crash-xxx-core-file-templates.patch -- cgit v1.2.3