mainline merges

3 files changed, 7 insertions, 28 deletions

diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index 1c6f3c327..10c96225a 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -139,6 +139,7 @@ int sbox_run(unsigned filter, int num, ...) {
                                 exit(1);
                         }
                         dup2(fd,STDIN_FILENO);
+                        close(fd);
                 }
                 else if ((filter & SBOX_ALLOW_STDIN) == 0) {
                         int fd = open("/dev/null",O_RDWR, 0);
diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c
index de64d50c5..856adb8fe 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.c
+++ b/src/libpostexecseccomp/libpostexecseccomp.c
@@ -32,8 +32,10 @@ static void load_seccomp(void) {
                 return;
 
         off_t size = lseek(fd, 0, SEEK_END);
-        if (size <= 0)
+        if (size <= 0) {
+                close(fd);
                 return;
+        }
         unsigned short entries = (unsigned short) size / (unsigned short) sizeof(struct sock_filter);
         struct sock_filter *filter = MAP_FAILED;
         if (size != 0)
diff --git a/test/environment/nice.exp b/test/environment/nice.exp
index b989ea37a..9a7e2e9f7 100755
--- a/test/environment/nice.exp
+++ b/test/environment/nice.exp
@@ -14,11 +14,7 @@ expect {
 }
 sleep 1
 
-send -- "top -b -n 1\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        $env(USER)
-}
+send -- "top -b -n 1 | awk '{ print \$4, \$12 }'\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "15"
@@ -28,10 +24,6 @@ expect {
         "bash"
 }
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        $env(USER)
-}
-expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         "15"
 }
@@ -51,11 +43,7 @@ expect {
 }
 sleep 1
 
-send -- "top -b -n 1\r"
-expect {
-        timeout {puts "TESTING ERROR 11\n";exit}
-        $env(USER)
-}
+send -- "top -b -n 1 | awk '{ print \$4, \$12 }'\r"
 expect {
         timeout {puts "TESTING ERROR 12\n";exit}
         "15"
@@ -65,10 +53,6 @@ expect {
         "bash"
 }
 expect {
-        timeout {puts "TESTING ERROR 14\n";exit}
-        $env(USER)
-}
-expect {
         timeout {puts "TESTING ERROR 15\n";exit}
         "15"
 }
@@ -90,11 +74,7 @@ expect {
 }
 sleep 1
 
-send -- "top -b -n 1\r"
-expect {
-        timeout {puts "TESTING ERROR 18\n";exit}
-        $env(USER)
-}
+send -- "top -b -n 1 | awk '{ print \$4, \$12 }'\r"
 expect {
         timeout {puts "TESTING ERROR 19\n";exit}
         "0"
@@ -104,10 +84,6 @@ expect {
         "bash"
 }
 expect {
-        timeout {puts "TESTING ERROR 21\n";exit}
-        $env(USER)
-}
-expect {
         timeout {puts "TESTING ERROR 22\n";exit}
         "0"
 }