Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sandbox:master commit in: libsandbox/
Date: Tue, 29 Mar 2016 12:24:42
Message-Id: 1459242193.9fabf8eb94d8866c4f039462d1bdd06cdb0e22eb.vapier@gentoo
1 commit: 9fabf8eb94d8866c4f039462d1bdd06cdb0e22eb
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 29 09:03:13 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 29 09:03:13 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=9fabf8eb
7
8 libsandbox: make check_syscall ISE a little more useful
9
10 Showing just the resolved paths isn't too helpful when they're both
11 NULL. Also include the failing func & original file path.
12
13 URL: https://bugs.gentoo.org/553092
14 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
15
16 libsandbox/libsandbox.c | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19 diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c
20 index 7555862..cbe1aa1 100644
21 --- a/libsandbox/libsandbox.c
22 +++ b/libsandbox/libsandbox.c
23 @@ -985,8 +985,8 @@ static int check_syscall(sbcontext_t *sbcontext, int sb_nr, const char *func,
24 return 2;
25
26 /* If we get here, something bad happened */
27 - sb_ebort("ISE:\n\tabs_path: %s\n\tres_path: %s\n",
28 - absolute_path, resolved_path);
29 + sb_ebort("ISE: %s(%s)\n\tabs_path: %s\n\tres_path: %s\n",
30 + func, file, absolute_path, resolved_path);
31 }
32
33 bool is_sandbox_on(void)