diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-09 13:09:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-09 13:09:50 -0400 |
| commit | 410ce4cb49016b86a95056c8997d020c0c95d930 (patch) | |
| tree | e20223ba9251be9e12f3501d9e3f0dd60e85fba5 | |
| parent | 1a7419c3df300483f111923daca43febc33b368b (diff) | |
| parent | d5b2cbea106e020436d577e42672d281400558dd (diff) | |
| download | tor-410ce4cb49016b86a95056c8997d020c0c95d930.tar.gz tor-410ce4cb49016b86a95056c8997d020c0c95d930.zip | |
Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5
| -rw-r--r-- | changes/bug15088 | 4 | ||||
| -rw-r--r-- | src/common/sandbox.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug15088 b/changes/bug15088 new file mode 100644 index 0000000000..95878bdb39 --- /dev/null +++ b/changes/bug15088 @@ -0,0 +1,4 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Upon receiving sighup, do not crash during attempts to call + wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from + "sanic". diff --git a/src/common/sandbox.c b/src/common/sandbox.c index dbbaa59d7c..e43b64b913 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -164,6 +164,7 @@ static int filter_nopar_gen[] = { #endif SCMP_SYS(stat), SCMP_SYS(uname), + SCMP_SYS(wait4), SCMP_SYS(write), SCMP_SYS(writev), SCMP_SYS(exit_group), |