diff options
| author | Phil Sutter <phil@nwl.cc> | 2022-08-31 13:00:52 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-08-31 17:05:01 +0200 |
| commit | 96980c548d3a1aeb07ab6aaef45389efb058a69a (patch) | |
| tree | 81647e9ef472af9d1ace0942d659ff0b5aed6bc5 /src/read_config_yy.y | |
| parent | c23f117ed4414aa848f273a6e77850471ce21e0e (diff) | |
local: Avoid sockaddr_un::sun_path buffer overflow
The array's size in struct sockaddr_un is only UNIX_PATH_MAX and
according to unix(7), it should hold a null-terminated string. So adjust
config reader to reject paths of length UNIX_PATH_MAX and above and
adjust the internal arrays to aid the compiler.
Fixes: f196de88cdd97 ("src: fix strncpy -Wstringop-truncation warnings")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src/read_config_yy.y')
| -rw-r--r-- | src/read_config_yy.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/read_config_yy.y b/src/read_config_yy.y index 5815d6a..a2154be 100644 --- a/src/read_config_yy.y +++ b/src/read_config_yy.y @@ -699,12 +699,12 @@ unix_options: unix_option : T_PATH T_PATH_VAL { - if (strlen($2) > UNIX_PATH_MAX) { + if (strlen($2) >= UNIX_PATH_MAX) { dlog(LOG_ERR, "Path is longer than %u characters", - UNIX_PATH_MAX); + UNIX_PATH_MAX - 1); exit(EXIT_FAILURE); } - snprintf(conf.local.path, sizeof(conf.local.path), "%s", $2); + strcpy(conf.local.path, $2); free($2); }; |