[tor-commits] [tor/master] Use the proper syscall in sandbox error messages

[nickm at torproject.org]

commit c79e2863866ff4730fb3892d6cba3cf40e15077e
Author: cypherpunks <cypherpunks at torproject.org>
Date:   Wed Jun 28 12:35:01 2017 +0000

    Use the proper syscall in sandbox error messages
    
    Fixes #22750.
---
 changes/ticket22750  | 3 +++
 src/common/sandbox.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changes/ticket22750 b/changes/ticket22750
new file mode 100644
index 0000000..6bc1fb2
--- /dev/null
+++ b/changes/ticket22750
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logging, sandbox):
+    - Use the correct system call in sandbox error messages. Fixes bug
+      22750; bugfix on 0.2.5.1-alpha.
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 52caa4f..fb57902 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -480,7 +480,7 @@ sb_chmod(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
       rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(chmod),
             SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value));
       if (rc != 0) {
-        log_err(LD_BUG,"(Sandbox) failed to add open syscall, received "
+        log_err(LD_BUG,"(Sandbox) failed to add chmod syscall, received "
             "libseccomp error %d", rc);
         return rc;
       }
@@ -505,7 +505,7 @@ sb_chown(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
       rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(chown),
             SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value));
       if (rc != 0) {
-        log_err(LD_BUG,"(Sandbox) failed to add open syscall, received "
+        log_err(LD_BUG,"(Sandbox) failed to add chown syscall, received "
             "libseccomp error %d", rc);
         return rc;
       }
@@ -1037,7 +1037,7 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
       rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat64),
           SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value));
       if (rc != 0) {
-        log_err(LD_BUG,"(Sandbox) failed to add open syscall, received "
+        log_err(LD_BUG,"(Sandbox) failed to add stat64 syscall, received "
             "libseccomp  error %d", rc);
         return rc;
       }