testing

9 files changed, 60 insertions, 19 deletions

diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index 881f20b1f..ee67a5696 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -76,6 +76,7 @@ void fs_private_dev(void){
         fs_build_mnt_dir();
         
         if (have_dri) {
+                /* coverity[toctou] */
                 rv = mkdir(DRI_DIR, 0755);
                 if (rv == -1)
                         errExit("mkdir");
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 3d6d4cfb3..8d2664c16 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -946,10 +946,6 @@ int main(int argc, char **argv) {
                                 fprintf(stderr, "Error: no network device configured\n");
                                 return 1;
                         }
-                        if (br->mtu) {
-                                fprintf(stderr, "Error: cannot configure mtu twice for the same interface\n");
-                                return 1;
-                        }
 
                         if (sscanf(argv[i] + 6, "%d", &br->mtu) != 1 || br->mtu < 68 || br->mtu > 9198) {
                                 fprintf(stderr, "Error: invalid mtu value\n");
diff --git a/src/firejail/network.c b/src/firejail/network.c
index 5469bbcd1..461946d83 100644
--- a/src/firejail/network.c
+++ b/src/firejail/network.c
@@ -106,6 +106,7 @@ int net_get_mtu(const char *ifname) {
         if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
                 errExit("socket");
 
+        memset(&ifr, 0, sizeof(ifr));
         ifr.ifr_addr.sa_family = AF_INET;
         strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
         if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == 0)
@@ -133,6 +134,7 @@ void net_set_mtu(const char *ifname, int mtu) {
         if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
                 errExit("socket");
 
+        memset(&ifr, 0, sizeof(ifr));
         ifr.ifr_addr.sa_family = AF_INET;
         strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
         ifr.ifr_mtu = mtu;
diff --git a/test/name.exp b/test/hostname.exp
index 42f78dd12..42f78dd12 100755
--- a/test/name.exp
+++ b/test/hostname.exp
diff --git a/test/net_mtu.exp b/test/net_mtu.exp
new file mode 100755
index 000000000..2940241c1
--- /dev/null
+++ b/test/net_mtu.exp
@@ -0,0 +1,30 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+# check ip address
+send -- "firejail --net=br0 --mtu=1000\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "ip link show\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "eth0"
+}
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "mtu 1000"
+}
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "state UP"
+}
+
+puts "\nall done\n"
+
diff --git a/test/noroot.exp b/test/noroot.exp
index d16c28dbe..37d55fe78 100755
--- a/test/noroot.exp
+++ b/test/noroot.exp
@@ -51,13 +51,6 @@ expect {
 }
 puts "\n"
 
-send -- "cat /etc/hostname\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "noroot-sandbox"
-}
-puts "\n"
-
 send -- "ping 0\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
diff --git a/test/option-join.exp b/test/option-join.exp
index ad8ba73e0..6250e87a2 100755
--- a/test/option-join.exp
+++ b/test/option-join.exp
@@ -17,10 +17,6 @@ expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Switching to pid"
 }
-expect {
-        timeout {puts "TESTING ERROR 2 (join) \n";exit}
-        "@svntesting"
-}
 sleep 1
 
 
@@ -40,4 +36,4 @@ expect {
 }
 sleep 1
 
-puts "\n"
+puts "\nall done\n"
diff --git a/test/quiet.exp b/test/quiet.exp
new file mode 100755
index 000000000..fa46aebf2
--- /dev/null
+++ b/test/quiet.exp
@@ -0,0 +1,17 @@
+#!/usr/bin/expect -f
+
+set timeout 4
+spawn $env(SHELL)
+match_max 100000
+
+# check ip address
+send -- "firejail --net=br0 --quiet\r"
+expect {
+        "Child process initialized" {puts "TESTING ERROR 1\n";exit}
+        "Interface" {puts "TESTING ERROR 1\n";exit}
+}
+sleep 1
+send -- "\r"
+
+puts "\nall done\n"
+
diff --git a/test/test.sh b/test/test.sh
index 80aa7f3e8..7d43a5786 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -125,9 +125,6 @@ ls -al > tmpreadonly
 sleep 5
 rm -f tmpreadonly
 
-echo "TESTING: name"
-./name.exp
-
 echo "TESTING: zsh"
 ./shell_zsh.exp
 
@@ -354,6 +351,9 @@ echo "TESTING: read/write /var/lock"
 echo "TESTING: read/write /dev/shm"
 ./fs_dev_shm.exp
 
+echo "TESTING: quiet"
+./quiet.exp
+
 echo "TESTING: local network"
 ./net_local.exp
 
@@ -366,6 +366,12 @@ echo "TESTING: network IP"
 echo "TESTING: network MAC"
 ./net_mac.exp
 
+echo "TESTING: network MTU"
+./net_mtu.exp
+
+echo "TESTING: network hostname"
+./hostname.exp
+
 echo "TESTING: network bad IP"
 ./net_badip.exp