External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-07-06 17:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf, tap: False "Buffer not null terminated" positives, CWE-170

Browse Source 
Those strings are actually guaranteed to be NULL-terminated. Reported
by Coverity.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-04-05 12:33:31 +02:00
parent e46f67f152
commit ceddcac74a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.c
View File

@ -1035,7 +1035,7 @@ void conf(struct ctx *c, int argc, char **argv)
usage(argv[0]); usage(argv[0]);
} }
ret = snprintf(c->sock_path, sizeof(c->sock_path), "%s", ret = snprintf(c->sock_path, UNIX_SOCK_MAX - 1, "%s",
optarg); optarg);
if (ret <= 0 || ret >= (int)sizeof(c->pcap)) { if (ret <= 0 || ret >= (int)sizeof(c->pcap)) {
err("Invalid socket path: %s", optarg); err("Invalid socket path: %s", optarg);
@ -1048,9 +1048,9 @@ void conf(struct ctx *c, int argc, char **argv)
usage(argv[0]); usage(argv[0]);
} }
ret = snprintf(c->pasta_ifn, sizeof(c->pasta_ifn), "%s", ret = snprintf(c->pasta_ifn, IFNAMSIZ - 1, "%s",
optarg); optarg);
if (ret <= 0 || ret >= (int)sizeof(c->pasta_ifn)) { if (ret <= 0 || ret >= IFNAMSIZ - 1) {
err("Invalid interface name: %s", optarg); err("Invalid interface name: %s", optarg);
usage(argv[0]); usage(argv[0]);
} }

6
tap.c
View File

@ -798,9 +798,9 @@ static void tap_sock_unix_init(struct ctx *c)
char *path = addr.sun_path; char *path = addr.sun_path;
if (*c->sock_path) if (*c->sock_path)
strncpy(path, c->sock_path, UNIX_PATH_MAX); memcpy(path, c->sock_path, UNIX_PATH_MAX);
else else
snprintf(path, UNIX_PATH_MAX, UNIX_SOCK_PATH, i); snprintf(path, UNIX_PATH_MAX - 1, UNIX_SOCK_PATH, i);
ex = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0); ex = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (ex < 0) { if (ex < 0) {
@ -899,7 +899,7 @@ static int tap_ns_tun(void *arg)
int flags = O_RDWR | O_NONBLOCK | O_CLOEXEC; int flags = O_RDWR | O_NONBLOCK | O_CLOEXEC;
struct ctx *c = (struct ctx *)arg; struct ctx *c = (struct ctx *)arg;
strncpy(ifr.ifr_name, c->pasta_ifn, IFNAMSIZ); memcpy(ifr.ifr_name, c->pasta_ifn, IFNAMSIZ);
if (ns_enter(c) || if (ns_enter(c) ||
(tun_ns_fd = open("/dev/net/tun", flags)) < 0 || (tun_ns_fd = open("/dev/net/tun", flags)) < 0 ||