summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
diff options
context:
space:
mode:
authorYureka Lilian <yuka@yuka.dev>2023-03-21 08:46:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-23 22:36:46 +0000
commitab7a9262a5616b299579c686428da028f72250a2 (patch)
tree2444cd01d5b53e36abb12f191e8980ed81f791ed /meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
parent13c1529b70345b0446482e8952e0b4b452bce7b1 (diff)
downloadpoky-ab7a9262a5616b299579c686428da028f72250a2.tar.gz
systemd: rebase musl patches
(From OE-Core rev: f34f6ab04b443608497b73668365819343d0c2fe) Signed-off-by: Yureka Lilian <yuka@yuka.dev> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch93
1 files changed, 0 insertions, 93 deletions
diff --git a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
deleted file mode 100644
index 6367adce07..0000000000
--- a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ /dev/null
@@ -1,93 +0,0 @@
1From 46fdc959257d60d9b32953cae0152ae118f8564b Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 10 Oct 2017 14:33:30 -0700
4Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
5
6Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right
7thing 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
12Note that laccess() is never passing AT_EACCESS so a lot of the
13discussion in the links above doesn't apply. Note also that
14(currently) all systemd callers of laccess() pass mode as F_OK, so
15only check for existence of a file, not access permissions.
16Therefore, in this case, the only distiction between faccessat()
17with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the behaviour
18for broken symlinks; laccess() on a broken symlink will succeed with
19(flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0).
20
21The laccess() macros was added to systemd some time ago and it's not
22clear if or why it needs to return success for broken symlinks. Maybe
23just historical and not actually necessary or desired behaviour?
24
25Upstream-Status: Inappropriate [musl specific]
26
27Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
28
29---
30 src/basic/fs-util.h | 21 ++++++++++++++++++++-
31 src/shared/base-filesystem.c | 6 +++---
32 2 files changed, 23 insertions(+), 4 deletions(-)
33
34--- a/src/basic/fs-util.h
35+++ b/src/basic/fs-util.h
36@@ -47,8 +47,27 @@ int futimens_opath(int fd, const struct
37 int fd_warn_permissions(const char *path, int fd);
38 int stat_warn_permissions(const char *path, const struct stat *st);
39
40+/*
41+ Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to
42+ do and it's not portable (not supported by musl). See:
43+
44+ http://lists.landley.net/pipermail/toybox-landley.net/2014-September/003610.html
45+ http://www.openwall.com/lists/musl/2015/02/05/2
46+
47+ Note that laccess() is never passing AT_EACCESS so a lot of the discussion in
48+ the links above doesn't apply. Note also that (currently) all systemd callers
49+ of laccess() pass mode as F_OK, so only check for existence of a file, not
50+ access permissions. Therefore, in this case, the only distiction between
51+ faccessat() with (flag == 0) and (flag == AT_SYMLINK_NOFOLLOW) is the
52+ behaviour for broken symlinks; laccess() on a broken symlink will succeed
53+ with (flag == AT_SYMLINK_NOFOLLOW) and fail (flag == 0).
54+
55+ The laccess() macros was added to systemd some time ago and it's not clear if
56+ or why it needs to return success for broken symlinks. Maybe just historical
57+ and not actually necessary or desired behaviour?
58+*/
59 #define laccess(path, mode) \
60- RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW))
61+ RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), 0))
62
63 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
64
65--- a/src/shared/base-filesystem.c
66+++ b/src/shared/base-filesystem.c
67@@ -131,7 +131,7 @@ int base_filesystem_create(const char *r
68 return log_error_errno(errno, "Failed to open root file system: %m");
69
70 for (size_t i = 0; i < ELEMENTSOF(table); i++) {
71- if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
72+ if (faccessat(fd, table[i].dir, F_OK, 0) >= 0)
73 continue;
74
75 if (table[i].target) {
76@@ -139,7 +139,7 @@ int base_filesystem_create(const char *r
77
78 /* check if one of the targets exists */
79 NULSTR_FOREACH(s, table[i].target) {
80- if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
81+ if (faccessat(fd, s, F_OK, 0) < 0)
82 continue;
83
84 /* check if a specific file exists at the target path */
85@@ -150,7 +150,7 @@ int base_filesystem_create(const char *r
86 if (!p)
87 return log_oom();
88
89- if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
90+ if (faccessat(fd, p, F_OK, 0) < 0)
91 continue;
92 }
93