nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use format_hex_number_sigsafe to format syscalls in sandbox.c

Browse Source 
This way, we don't have to use snprintf, which is not guaranteed to
be signal-safe.

(Technically speaking, strlen() and strlcpy() are not guaranteed to
be signal-safe by the POSIX standard. But I claim that they are on
every platform that supports libseccomp2, which is what matters
here.)
This commit is contained in:
Nick Mathewson 2013-07-15 13:07:09 -04:00
parent 9fda7e8cd1
commit 85178e2e93
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/sandbox.c
View File

@ -13,9 +13,10 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "orconfig.h"
#include "sandbox.h" #include "sandbox.h"
#include "torlog.h" #include "torlog.h"
#include "orconfig.h" #include "util.h"
#if defined(HAVE_SECCOMP_H) && defined(__linux__) #if defined(HAVE_SECCOMP_H) && defined(__linux__)
#define USE_LIBSECCOMP #define USE_LIBSECCOMP
@ -202,7 +203,7 @@ static void
sigsys_debugging(int nr, siginfo_t *info, void *void_context) sigsys_debugging(int nr, siginfo_t *info, void *void_context)
{ {
ucontext_t *ctx = (ucontext_t *) (void_context); ucontext_t *ctx = (ucontext_t *) (void_context);
char message[64]; char message[256];
int rv = 0, syscall, length, err; int rv = 0, syscall, length, err;
(void) nr; (void) nr;
@ -214,11 +215,12 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context)
syscall = ctx->uc_mcontext.gregs[REG_SYSCALL]; syscall = ctx->uc_mcontext.gregs[REG_SYSCALL];
/* XXXX Avoid use of snprintf; it isn't on the list of Stuff You're Allowed strlcpy(message, "\n\n(Sandbox) Caught a bad syscall attempt (syscall 0x",
* To Do In A Signal Handler. */ sizeof(message));
length = snprintf(message, sizeof(message), (void) format_hex_number_sigsafe(syscall, message+strlen(message),
"\n\n(Sandbox) bad syscall (%d) was caught.\n", sizeof(message)-strlen(message));
syscall); strlcat(message, ")\n", sizeof(message));
length = strlen(message);
err = 0; err = 0;
if (sigsys_debugging_fd >= 0) { if (sigsys_debugging_fd >= 0) {