gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libredirect: abort if rewritten UNIX socket path is too long

Browse Source 
Use snprintf instead of strncpy to make it easier/more efficient to
detect truncation.

abort() (and nothing else) is already used for error handling in
rewrite(), so use that here too, in bind() and connect().
This commit is contained in:
Bjørn Forsman
2026-01-24 23:13:33 +01:00
parent ebc3f31747
commit 34724e6988
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/li/libredirect/libredirect.c
+8 -4
View File
@@ -120,8 +120,10 @@ WRAPPER(int, bind)(int socket, const struct sockaddr *addr, socklen_t addr_len)
struct sockaddr_un real_addr_un = *(struct sockaddr_un *)addr;
const char *sun_path = rewrite(real_addr_un.sun_path, buf);
if (sun_path != real_addr_un.sun_path) {
strncpy(real_addr_un.sun_path, buf, sizeof(real_addr_un.sun_path) - 1);
real_addr_un.sun_path[sizeof(real_addr_un.sun_path) - 1] = '\0';
int n = snprintf(real_addr_un.sun_path, sizeof(real_addr_un.sun_path), "%s", buf);
if (n < 0 || n >= sizeof(real_addr_un.sun_path)) {
abort();
}
real_addr = (struct sockaddr *)&real_addr_un;
addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(real_addr_un.sun_path) + 1;
}
@@ -139,8 +141,10 @@ WRAPPER(int, connect)(int socket, const struct sockaddr *addr, socklen_t addr_le
struct sockaddr_un real_addr_un = *(struct sockaddr_un *)addr;
const char *sun_path = rewrite(real_addr_un.sun_path, buf);
if (sun_path != real_addr_un.sun_path) {
strncpy(real_addr_un.sun_path, buf, sizeof(real_addr_un.sun_path) - 1);
real_addr_un.sun_path[sizeof(real_addr_un.sun_path) - 1] = '\0';
int n = snprintf(real_addr_un.sun_path, sizeof(real_addr_un.sun_path), "%s", buf);
if (n < 0 || n >= sizeof(real_addr_un.sun_path)) {
abort();
}
real_addr = (struct sockaddr *)&real_addr_un;
addr_len = offsetof(struct sockaddr_un, sun_path) + strlen(real_addr_un.sun_path) + 1;
}