diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/fs_dev.c | 1 | ||||
-rw-r--r-- | src/firejail/main.c | 4 | ||||
-rw-r--r-- | src/firejail/network.c | 2 |
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){ | |||
76 | fs_build_mnt_dir(); | 76 | fs_build_mnt_dir(); |
77 | 77 | ||
78 | if (have_dri) { | 78 | if (have_dri) { |
79 | /* coverity[toctou] */ | ||
79 | rv = mkdir(DRI_DIR, 0755); | 80 | rv = mkdir(DRI_DIR, 0755); |
80 | if (rv == -1) | 81 | if (rv == -1) |
81 | errExit("mkdir"); | 82 | 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) { | |||
946 | fprintf(stderr, "Error: no network device configured\n"); | 946 | fprintf(stderr, "Error: no network device configured\n"); |
947 | return 1; | 947 | return 1; |
948 | } | 948 | } |
949 | if (br->mtu) { | ||
950 | fprintf(stderr, "Error: cannot configure mtu twice for the same interface\n"); | ||
951 | return 1; | ||
952 | } | ||
953 | 949 | ||
954 | if (sscanf(argv[i] + 6, "%d", &br->mtu) != 1 || br->mtu < 68 || br->mtu > 9198) { | 950 | if (sscanf(argv[i] + 6, "%d", &br->mtu) != 1 || br->mtu < 68 || br->mtu > 9198) { |
955 | fprintf(stderr, "Error: invalid mtu value\n"); | 951 | 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) { | |||
106 | if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) | 106 | if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) |
107 | errExit("socket"); | 107 | errExit("socket"); |
108 | 108 | ||
109 | memset(&ifr, 0, sizeof(ifr)); | ||
109 | ifr.ifr_addr.sa_family = AF_INET; | 110 | ifr.ifr_addr.sa_family = AF_INET; |
110 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); | 111 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); |
111 | if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == 0) | 112 | if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == 0) |
@@ -133,6 +134,7 @@ void net_set_mtu(const char *ifname, int mtu) { | |||
133 | if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) | 134 | if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) |
134 | errExit("socket"); | 135 | errExit("socket"); |
135 | 136 | ||
137 | memset(&ifr, 0, sizeof(ifr)); | ||
136 | ifr.ifr_addr.sa_family = AF_INET; | 138 | ifr.ifr_addr.sa_family = AF_INET; |
137 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); | 139 | strncpy(ifr.ifr_name, ifname, IFNAMSIZ); |
138 | ifr.ifr_mtu = mtu; | 140 | ifr.ifr_mtu = mtu; |