Current patch removes the uint8_t* cast in src/basic/recurse-dir.c:57
to fix musl build, but it changes the value here as pointer arithmetic
is type-depended in C. This patch corrects the behavior by adding an
extra cast to struct dirent*.
Also changes the patch's Upstream-Status to Inappropriate as it's musl-
specific.
Signed-off-by: Jiaqing Zhao <jiaqing.z...@linux.intel.com>
---
...0001-pass-correct-parameters-to-getdents64.patch | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git
a/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
b/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
index 028f50b243..9ebff9825a 100644
---
a/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
+++
b/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
@@ -1,4 +1,4 @@
-From 8c8899b4641125cfe8e7baee32e5c5f452545d2c Mon Sep 17 00:00:00 2001
+From dab02796780f00d689cc1c7a0ba81abe7c5f28d0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.k...@gmail.com>
Date: Fri, 21 Jan 2022 15:15:11 -0800
Subject: [PATCH] pass correct parameters to getdents64
@@ -12,16 +12,16 @@ Fixes
n = getdents64(fd, &buffer, sizeof(buffer));
^~~~~~~
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [musl specific]
Signed-off-by: Khem Raj <raj.k...@gmail.com>
-
+Signed-off-by: Jiaqing Zhao <jiaqing.z...@linux.intel.com>
---
src/basic/recurse-dir.c | 2 +-
src/basic/stat-util.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
-index efa1797b7b..797285e3be 100644
+index efa1797b7b..03ff10ebe9 100644
--- a/src/basic/recurse-dir.c
+++ b/src/basic/recurse-dir.c
@@ -54,7 +54,7 @@ int readdir_all(int dir_fd,
@@ -29,7 +29,7 @@ index efa1797b7b..797285e3be 100644
assert(bs > de->buffer_size);
- n = getdents64(dir_fd, (uint8_t*) de->buffer +
de->buffer_size, bs - de->buffer_size);
-+ n = getdents64(dir_fd, de->buffer + de->buffer_size, bs -
de->buffer_size);
++ n = getdents64(dir_fd, (struct dirent*)((uint8_t*) de->buffer
+ de->buffer_size), bs - de->buffer_size);
if (n < 0)
return -errno;
if (n == 0)
@@ -46,3 +46,6 @@ index c2269844f8..7cd6c7fa42 100644
if (n < 0)
return -errno;
+--
+2.34.1
+
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#166021):
https://lists.openembedded.org/g/openembedded-core/message/166021
Mute This Topic: https://lists.openembedded.org/mt/91288052/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
