FAILED: patch "[PATCH] selftests/seccomp: Support glibc 2.26 siginfo_t.h" failed to apply to 4.4-stable tree

From 10859f3855db4c6f10dc7974ff4b3a292f3de8e0 Mon Sep 17 00:00:00 2001

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

Quoted 1 line

From 10859f3855db4c6f10dc7974ff4b3a292f3de8e0 Mon Sep 17 00:00:00 2001

From: Kees Cook <[email protected]>
Date: Thu, 7 Sep 2017 16:32:46 -0700
Subject: [PATCH] selftests/seccomp: Support glibc 2.26 siginfo_t.h

The 2.26 release of glibc changed how siginfo_t is defined, and the earlier work-around to using the kernel definition are no longer needed. The old way needs to stay around for a while, though.

Reported-by Seth Forshee <[email protected]>

Cc Andy Lutomirski <[email protected]>

Cc Will Drewry <[email protected]>

Cc Shuah Khan <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Kees Cook <[email protected]>

Tested-by Seth Forshee <[email protected]>

Signed-off-by Shuah Khan <[email protected]>

tools/testing/selftests/seccomp/seccomp_bpf.c +12 -4

index 4d6f92a9df6b..19cd272c234d 100644
@@ -6,10 +6,18 @@
  */
 
 #include <sys/types.h>
-#include <asm/siginfo.h>
-#define __have_siginfo_t 1
-#define __have_sigval_t 1
-#define __have_sigevent_t 1
+
+/*
+ * glibc 2.26 and later have SIGSYS in siginfo_t. Before that,
+ * we need to use the kernel's siginfo.h file and trick glibc
+ * into accepting it.
+ */
+#if !__GLIBC_PREREQ(2, 26)
+# include <asm/siginfo.h>
+# define __have_siginfo_t 1
+# define __have_sigval_t 1
+# define __have_sigevent_t 1
+#endif
 
 #include <errno.h>
 #include <linux/filter.h>