dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30196 from YHNdnzj/fchmodat2-no-symlink

Browse Source 
Revert "nspawn-patch-uid: try fchmodat2() to restore mode of symlink"
This commit is contained in:
Yu Watanabe
2023-11-26 03:30:58 +09:00
committed by GitHub
parent 22be476571 0cdffada3d
commit 8add4a9801
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nspawn/nspawn-patch-uid.c
View File

@@ -11,7 +11,6 @@
#include "fileio.h"
#include "fs-util.h"
#include "missing_magic.h"
#include "missing_syscall.h"
#include "nspawn-def.h"
#include "nspawn-patch-uid.h"
#include "stat-util.h"
@@ -240,18 +239,14 @@ static int patch_fd(int fd, const char *name, const struct stat *st, uid_t shift
/* The Linux kernel alters the mode in some cases of chown(). Let's undo this. */
if (name) {
/* It looks like older glibc (before 2016) did not support AT_SYMLINK_NOFOLLOW. */
if (!S_ISLNK(st->st_mode))
r = RET_NERRNO(fchmodat(fd, name, st->st_mode, 0));
else {
r = RET_NERRNO(fchmodat2(fd, name, st->st_mode, AT_SYMLINK_NOFOLLOW));
if (IN_SET(r, -ENOSYS, -EPERM))
r = 0;
}
r = fchmodat(fd, name, st->st_mode, 0);
else /* Changing the mode of a symlink is not supported by Linux kernel. Don't bother. */
r = 0;
} else
r = RET_NERRNO(fchmod(fd, st->st_mode));
r = fchmod(fd, st->st_mode);
if (r < 0)
return r;
return -errno;
changed = true;
}