mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf: Use the right maximum buffer size for c->sock_path

Browse source 
UNIX_SOCK_MAX is the maximum number we'll append to the socket path
if we generate it automatically. If it's given on the command line,
it can be up to UNIX_PATH_MAX (including the terminating character)
long.

UNIX_SOCK_MAX happened to kind of fit because it's 100 (instead of
108).

Commit ceddcac74a ("conf, tap: False "Buffer not null terminated"
positives, CWE-170") fixed the wrong problem: the right fix for the
problem at hand was actually commit cc287af173 ("conf: Fix
incorrect bounds checking for sock_path parameter").

Fixes: ceddcac74a ("conf, tap: False "Buffer not null terminated" positives, CWE-170")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2024-06-27 22:16:45 +02:00
parent 403a7c14a0
commit b625ed5fee
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf.c
View file

@ -1398,7 +1398,7 @@ void conf(struct ctx *c, int argc, char **argv)
c->foreground = 1; c->foreground = 1;
break; break;
case 's': case 's':
ret = snprintf(c->sock_path, UNIX_SOCK_MAX - 1, "%s", ret = snprintf(c->sock_path, sizeof(c->sock_path), "%s",
optarg); optarg);
if (ret <= 0 || ret >= (int)sizeof(c->sock_path)) if (ret <= 0 || ret >= (int)sizeof(c->sock_path))
die("Invalid socket path: %s", optarg); die("Invalid socket path: %s", optarg);