picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udev: link_update() should fail if the entry in symlink dir couldn't have been created 

Follow-up for 30f6dce62c
This commit is contained in:
Franck Bui 2020-12-09 09:46:08 +01:00 committed by Lennart Poettering
parent 5e3effb1f3
commit 4e1db59274
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/udev/udev-node.c
View File

@ -214,20 +214,23 @@ static int link_update(sd_device *dev, const char *slink, bool add) {
if (!filename)
return log_oom();
if (!add && unlink(filename) == 0)
(void) rmdir(dirname);
if (add)
do {
if (!add) {
if (unlink(filename) == 0)
(void) rmdir(dirname);
} else
for (;;) {
_cleanup_close_ int fd = -1;
r = mkdir_parents(filename, 0755);
if (!IN_SET(r, 0, -ENOENT))
break;
return r;
fd = open(filename, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444);
if (fd < 0)
r = -errno;
} while (r == -ENOENT);
if (fd >= 0)
break;
if (errno != ENOENT)
return -errno;
}
/* If the database entry is not written yet we will just do one iteration and possibly wrong symlink
* will be fixed in the second invocation. */