morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-dhcp-server: reopen fd only when it is valid

Browse Source 
Fixes a bug in 11b88419ae.
This commit is contained in:
Yu Watanabe
2025-06-14 00:27:06 +09:00
parent 7ce370c466
commit 98b02dd7e7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libsystemd-network/sd-dhcp-server.c
View File

@@ -1605,9 +1605,13 @@ int sd_dhcp_server_set_lease_file(sd_dhcp_server *server, int dir_fd, const char
if (!path_is_safe(path))
return -EINVAL;
_cleanup_close_ int fd = fd_reopen(dir_fd, O_CLOEXEC | O_DIRECTORY | O_PATH);
if (fd < 0)
return fd;
_cleanup_close_ int fd = AT_FDCWD; /* Unlike our usual coding style, AT_FDCWD needs to be set,
* to pass a 'valid' fd. */
if (dir_fd >= 0) {
fd = fd_reopen(dir_fd, O_CLOEXEC | O_DIRECTORY | O_PATH);
if (fd < 0)
return fd;
}
r = free_and_strdup(&server->lease_file, path);
if (r < 0)