util-linux: fix pointer usage in hwclock param handling

Passing params as numbers to hwclock is broken in util-linux 2.39.3 due
to wrong pointer handling. So backport the fix from upstream included
since util-linux 2.41.

(From OE-Core rev: 3d8f88906f5560286462eaf55226b872e2805df7)

Signed-off-by: Bastian Krause <bst@pengutronix.de>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Bastian Krause 2025-10-29 19:12:24 +01:00 committed by Steve Sakoman
parent a2b737539e
commit 4f2287dcc4
2 changed files with 28 additions and 0 deletions

View File

@ -43,6 +43,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
file://CVE-2024-28085-0001.patch \
file://CVE-2024-28085-0002.patch \
file://fstab-isolation.patch \
file://sys-utils-hwclock-rtc-fix-pointer-usage.patch \
"
SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f"

View File

@ -0,0 +1,27 @@
From 7064cd275607a43223b2dbaef75c610f33f432ff Mon Sep 17 00:00:00 2001
From: Karthikeyan Krishnasamy <karthikeyan@linumiz.com>
Date: Sat, 23 Mar 2024 13:39:55 +0530
Subject: [PATCH] sys-utils: hwclock-rtc: fix pointer usage
passing double pointer doesn't fill param value
Signed-off-by: Karthikeyan Krishnasamy <karthikeyan@linumiz.com>
Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/1064a53e4ff357dc649a8c4a0a41dfb5a1191bba]
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
sys-utils/hwclock-rtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c
index 7094cd0..c797397 100644
--- a/sys-utils/hwclock-rtc.c
+++ b/sys-utils/hwclock-rtc.c
@@ -424,7 +424,7 @@ static int resolve_rtc_param_alias(const char *alias, __u64 *value)
/* kernel uapi __u64 can be defined differently than uint64_t */
static int strtoku64(const char *str, __u64 *num, int base)
{
- return ul_strtou64(str, (uint64_t *) &num, base);
+ return ul_strtou64(str, (uint64_t *) num, base);
}
/*