From 263ce2c5d1b3785c1d565c12bc6d9a4397cbcc91 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Thu, 8 Nov 2018 17:46:16 -0800 Subject: syscalls/sighold02: ignore reserved signals Some signals may be internally used by the C library. Do not attempt to verify these. Bug: 118442788 Signed-off-by: Steve Muckle Acked-by: Cyril Hrubis (cherry picked from commit 158f68e5561d68d5a26da1442d7f2231efda966f) Bug: 122314690 Test: run vts-kernel -m VtsKernelLtp -t syscalls.sighold02 Merged-In: I47c808b3c386d54c8f70e443d41b062c1ee86ec9 Change-Id: I47c808b3c386d54c8f70e443d41b062c1ee86ec9 --- testcases/kernel/syscalls/sighold/sighold02.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c index fdd0e736d..d1d4b0b06 100644 --- a/testcases/kernel/syscalls/sighold/sighold02.c +++ b/testcases/kernel/syscalls/sighold/sighold02.c @@ -55,16 +55,6 @@ # define NSIG _NSIG #endif -/* Needed for NPTL */ -#define SIGCANCEL 32 -#define SIGTIMER 33 - -/* Reserved in Android's bionic libc */ -#ifdef __ANDROID__ -# define SIGLIBCORE 34 -# define SIGDEBUGGERD 35 -#endif - /* ensure NUMSIGS is defined */ #ifndef NUMSIGS # define NUMSIGS NSIG @@ -83,17 +73,14 @@ static int sigs_map[NUMSIGS]; static int skip_sig(int sig) { + if (sig >= __SIGRTMIN && sig < SIGRTMIN) + return 1; + switch (sig) { case SIGCHLD: case SIGKILL: case SIGALRM: case SIGSTOP: - case SIGCANCEL: - case SIGTIMER: -#ifdef __ANDROID__ - case SIGLIBCORE: - case SIGDEBUGGERD: -#endif return 1; default: return 0; -- cgit v1.2.3