core/dynamic-user: two trivial modernizations (#40264)
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
#include "serialize.h"
|
||||
#include "siphash24.h"
|
||||
#include "socket-util.h"
|
||||
#include "stat-util.h"
|
||||
#include "stdio-util.h"
|
||||
#include "string-util.h"
|
||||
#include "uid-classification.h"
|
||||
@@ -232,24 +233,23 @@ static int pick_uid(char **suggested_paths, const char *name, uid_t *ret_uid) {
|
||||
xsprintf(lock_path, "/run/systemd/dynamic-uid/" UID_FMT, candidate);
|
||||
|
||||
for (;;) {
|
||||
struct stat st;
|
||||
|
||||
lock_fd = open(lock_path, O_CREAT|O_RDWR|O_NOFOLLOW|O_CLOEXEC|O_NOCTTY, 0600);
|
||||
if (lock_fd < 0)
|
||||
return -errno;
|
||||
|
||||
r = flock(lock_fd, LOCK_EX|LOCK_NB); /* Try to get a BSD file lock on the UID lock file */
|
||||
if (r < 0) {
|
||||
if (IN_SET(errno, EBUSY, EAGAIN))
|
||||
if (errno == EAGAIN)
|
||||
goto next; /* already in use */
|
||||
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (fstat(lock_fd, &st) < 0)
|
||||
return -errno;
|
||||
if (st.st_nlink > 0)
|
||||
r = fd_verify_linked(lock_fd);
|
||||
if (r >= 0)
|
||||
break;
|
||||
if (r != -EIDRM)
|
||||
return r;
|
||||
|
||||
/* Oh, bummer, we got the lock, but the file was unlinked between the time we opened it and
|
||||
* got the lock. Close it, and try again. */
|
||||
|
||||
Reference in New Issue
Block a user