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

udev-builtin-uaccess: open device node with O_PATH

Browse Source 
Some device node refuses to be opened with read-write mode.
Let's not open with O_RDWR, but open with O_PATH, and use
FORMAT_PROC_FD_PATH().

Follow-up for 1abb592f2f.

Fixes #38033.
This commit is contained in:
Yu Watanabe
2025-07-03 08:15:51 +09:00
parent 9c9bf7e3fa
commit aada48970e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/udev/udev-builtin-uaccess.c
View File

@@ -19,7 +19,7 @@ static int devnode_acl(int fd, uid_t uid) {
assert(fd >= 0);
_cleanup_(acl_freep) acl_t acl = NULL;
acl = acl_get_fd(fd);
acl = acl_get_file(FORMAT_PROC_FD_PATH(fd), ACL_TYPE_ACCESS);
if (!acl)
return -errno;
@@ -99,7 +99,7 @@ static int devnode_acl(int fd, uid_t uid) {
if (acl_calc_mask(&acl) < 0)
return -errno;
if (acl_set_fd(fd, acl) < 0)
if (acl_set_file(FORMAT_PROC_FD_PATH(fd), ACL_TYPE_ACCESS, acl) < 0)
return -errno;
return 0;
@@ -120,7 +120,7 @@ static int builtin_uaccess(UdevEvent *event, int argc, char *argv[]) {
if (!logind_running())
return 0;
_cleanup_close_ int fd = sd_device_open(dev, O_CLOEXEC|O_RDWR);
_cleanup_close_ int fd = sd_device_open(dev, O_CLOEXEC|O_PATH);
if (fd < 0)
return log_device_error_errno(dev, fd, "Failed to open device node: %m");