Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58052a74 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

selftests/seccomp: Support glibc 2.26 siginfo_t.h 



commit 10859f3855db4c6f10dc7974ff4b3a292f3de8e0 upstream.

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: default avatarSeth Forshee <seth.forshee@canonical.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Will Drewry <wad@chromium.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 831cca58

tools/testing/selftests/seccomp/seccomp_bpf.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -6,10 +6,18 @@ 
 */

 */





#include <sys/types.h>

#include <sys/types.h>



/*

 * 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>

# include <asm/siginfo.h>

# define __have_siginfo_t 1

# define __have_siginfo_t 1

# define __have_sigval_t 1

# define __have_sigval_t 1

# define __have_sigevent_t 1

# define __have_sigevent_t 1

#endif





#include <errno.h>

#include <errno.h>

#include <linux/filter.h>

#include <linux/filter.h>
@@ -676,7 +684,7 @@ TEST_F_SIGNAL(TRAP, ign, SIGSYS) 
	syscall(__NR_getpid);

	syscall(__NR_getpid);

}

}





static struct siginfo TRAP_info;

static siginfo_t TRAP_info;

static volatile int TRAP_nr;

static volatile int TRAP_nr;

static void TRAP_action(int nr, siginfo_t *info, void *void_context)

static void TRAP_action(int nr, siginfo_t *info, void *void_context)

{

{