mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
util-linux: Define pidfd_* function signatures
glibc 2.36 has added sys/pidfd.h and APIs for pidfd_send_signal and pidfd_open, therefore check for this header and include it if it exists (From OE-Core rev: 2c913a7b66ea756ebc65a573e1b5bb5dba6834d2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
@@ -35,6 +35,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
|
|||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
file://display_testname_for_subtest.patch \
|
file://display_testname_for_subtest.patch \
|
||||||
file://avoid_parallel_tests.patch \
|
file://avoid_parallel_tests.patch \
|
||||||
|
file://0001-check-for-sys-pidfd.h.patch \
|
||||||
file://CVE-2024-28085-0001.patch \
|
file://CVE-2024-28085-0001.patch \
|
||||||
file://CVE-2024-28085-0002.patch \
|
file://CVE-2024-28085-0002.patch \
|
||||||
file://CVE-2024-28085-0003.patch \
|
file://CVE-2024-28085-0003.patch \
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
From a77af2e46ea233d9e5d3b16396d41a252a5a3172 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sun, 7 Aug 2022 14:39:19 -0700
|
||||||
|
Subject: [PATCH] check for sys/pidfd.h
|
||||||
|
|
||||||
|
This header in newer glibc defines the signatures of functions
|
||||||
|
pidfd_send_signal() and pidfd_open() and when these functions are
|
||||||
|
defined by libc then we need to include the relevant header to get
|
||||||
|
the definitions. Clang 15+ has started to error out when function
|
||||||
|
signatures are missing.
|
||||||
|
|
||||||
|
Fixes errors like
|
||||||
|
misc-utils/kill.c:402:6: error: call to undeclared function 'pidfd_send_signal'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
||||||
|
if (pidfd_send_signal(pfd, ctl->numsig, &info, 0) < 0)
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/1769]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
configure.ac | 1 +
|
||||||
|
include/pidfd-utils.h | 4 +++-
|
||||||
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index c38d871..72e893f 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -339,6 +339,7 @@ AC_CHECK_HEADERS([ \
|
||||||
|
sys/mkdev.h \
|
||||||
|
sys/mount.h \
|
||||||
|
sys/param.h \
|
||||||
|
+ sys/pidfd.h \
|
||||||
|
sys/prctl.h \
|
||||||
|
sys/resource.h \
|
||||||
|
sys/sendfile.h \
|
||||||
|
diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
|
||||||
|
index 4a6c3a6..7c0c061 100644
|
||||||
|
--- a/include/pidfd-utils.h
|
||||||
|
+++ b/include/pidfd-utils.h
|
||||||
|
@@ -4,8 +4,10 @@
|
||||||
|
#if defined(__linux__)
|
||||||
|
# include <sys/syscall.h>
|
||||||
|
# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
|
||||||
|
+# ifdef HAVE_SYS_PIDFD_H
|
||||||
|
+# include <sys/pidfd.h>
|
||||||
|
+# endif
|
||||||
|
# include <sys/types.h>
|
||||||
|
-
|
||||||
|
# ifndef HAVE_PIDFD_SEND_SIGNAL
|
||||||
|
static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
|
||||||
|
unsigned int flags)
|
||||||
Reference in New Issue
Block a user