testing

3 files changed, 3 insertions, 4 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;