Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 1 | From 03e89da266edf70121a19ffc32a78cc3b97585ef Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
| 3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 4 | Subject: [PATCH 12/26] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | |
| 6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right |
| 7 | thing to do and it's not portable (not supported by musl). See: |
| 8 | |
| 9 | http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html |
| 10 | http://www.openwall.com/lists/musl/2015/02/05/2 |
| 11 | |
| 12 | Note that laccess() is never passing AT_EACCESS so a lot of the |
| 13 | discussion in the links above doesn't apply. Note also that |
| 14 | (currently) all systemd callers of laccess() pass mode as F_OK, so |
| 15 | only check for existence of a file, not access permissions. |
| 16 | Therefore, in this case, the only distiction between faccessat() |
| 17 | with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the behaviour |
| 18 | for broken symlinks; laccess() on a broken symlink will succeed with |
| 19 | (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). |
| 20 | |
| 21 | The laccess() macros was added to systemd some time ago and it's not |
| 22 | clear if or why it needs to return success for broken symlinks. Maybe |
| 23 | just historical and not actually necessary or desired behaviour? |
| 24 | |
| 25 | Upstream-Status: Inappropriate [musl specific] |
| 26 | |
| 27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 28 | --- |
| 29 | src/basic/fs-util.h | 22 +++++++++++++++++++++- |
| 30 | src/shared/base-filesystem.c | 6 +++--- |
| 31 | 2 files changed, 24 insertions(+), 4 deletions(-) |
| 32 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 33 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h |
| 34 | index 5dc8853eac..0491b3dae2 100644 |
| 35 | --- a/src/basic/fs-util.h |
| 36 | +++ b/src/basic/fs-util.h |
| 37 | @@ -43,7 +43,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 38 | int fd_warn_permissions(const char *path, int fd); |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 39 | int stat_warn_permissions(const char *path, const struct stat *st); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 40 | |
| 41 | -#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) |
| 42 | +/* |
| 43 | + Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to |
| 44 | + do and it's not portable (not supported by musl). See: |
| 45 | + |
| 46 | + http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html |
| 47 | + http://www.openwall.com/lists/musl/2015/02/05/2 |
| 48 | + |
| 49 | + Note that laccess() is never passing AT_EACCESS so a lot of the discussion in |
| 50 | + the links above doesn't apply. Note also that (currently) all systemd callers |
| 51 | + of laccess() pass mode as F_OK, so only check for existence of a file, not |
| 52 | + access permissions. Therefore, in this case, the only distiction between |
| 53 | + faccessat() with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the |
| 54 | + behaviour for broken symlinks; laccess() on a broken symlink will succeed |
| 55 | + with (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0). |
| 56 | + |
| 57 | + The laccess() macros was added to systemd some time ago and it's not clear if |
| 58 | + or why it needs to return success for broken symlinks. Maybe just historical |
| 59 | + and not actually necessary or desired behaviour? |
| 60 | +*/ |
| 61 | + |
| 62 | +#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), 0) |
| 63 | |
| 64 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); |
| 65 | int touch(const char *path); |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 66 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c |
| 67 | index 1d05409086..1ed06c31ab 100644 |
| 68 | --- a/src/shared/base-filesystem.c |
| 69 | +++ b/src/shared/base-filesystem.c |
| 70 | @@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 71 | return log_error_errno(errno, "Failed to open root file system: %m"); |
| 72 | |
| 73 | for (i = 0; i < ELEMENTSOF(table); i ++) { |
| 74 | - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) |
| 75 | + if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) |
| 76 | continue; |
| 77 | |
| 78 | if (table[i].target) { |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 79 | @@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 80 | |
| 81 | /* check if one of the targets exists */ |
| 82 | NULSTR_FOREACH(s, table[i].target) { |
| 83 | - if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0) |
| 84 | + if (faccessat(fd, s, F_OK, 0) < 0) |
| 85 | continue; |
| 86 | |
| 87 | /* check if a specific file exists at the target path */ |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 88 | @@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 89 | if (!p) |
| 90 | return log_oom(); |
| 91 | |
| 92 | - if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0) |
| 93 | + if (faccessat(fd, p, F_OK, 0) < 0) |
| 94 | continue; |
| 95 | } |
| 96 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 97 | -- |
| 98 | 2.27.0 |
| 99 | |