Module Name:    src
Committed By:   kamil
Date:           Thu Apr 25 11:47:59 UTC 2019

Modified Files:
        src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Do not allow 0 as ILL si_code as it's reserved for SI_USER


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/tests/lib/libc/sys/t_ptrace_wait.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.112 src/tests/lib/libc/sys/t_ptrace_wait.c:1.113
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.112	Thu Apr 25 11:45:12 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Thu Apr 25 11:47:59 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.112 2019/04/25 11:45:12 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.113 2019/04/25 11:47:59 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.112 2019/04/25 11:45:12 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.113 2019/04/25 11:47:59 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -471,7 +471,7 @@ traceme_crash(int sig)
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SEGV_MAPERR);
 		break;
 	case SIGILL:
-		ATF_REQUIRE(info.psi_siginfo.si_code >= 0 &&
+		ATF_REQUIRE(info.psi_siginfo.si_code >= ILL_ILLOPC &&
 		            info.psi_siginfo.si_code <= ILL_BADSTK);
 		break;
 	case SIGFPE:
@@ -648,7 +648,7 @@ traceme_signalmasked_crash(int sig)
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SEGV_MAPERR);
 		break;
 	case SIGILL:
-		ATF_REQUIRE(info.psi_siginfo.si_code >= 0 &&
+		ATF_REQUIRE(info.psi_siginfo.si_code >= ILL_ILLOPC &&
 		            info.psi_siginfo.si_code <= ILL_BADSTK);
 		break;
 	case SIGFPE:
@@ -828,7 +828,7 @@ traceme_signalignored_crash(int sig)
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SEGV_MAPERR);
 		break;
 	case SIGILL:
-		ATF_REQUIRE(info.psi_siginfo.si_code >= 0 &&
+		ATF_REQUIRE(info.psi_siginfo.si_code >= ILL_ILLOPC &&
 		            info.psi_siginfo.si_code <= ILL_BADSTK);
 		break;
 	case SIGFPE:
@@ -2126,7 +2126,7 @@ unrelated_tracer_sees_crash(int sig, boo
 			FORKEE_ASSERT_EQ(info.psi_siginfo.si_code, SEGV_MAPERR);
 			break;
 		case SIGILL:
-			FORKEE_ASSERT(info.psi_siginfo.si_code >= 0 &&
+			FORKEE_ASSERT(info.psi_siginfo.si_code >= ILL_ILLOPC &&
 			            info.psi_siginfo.si_code <= ILL_BADSTK);
 			break;
 		case SIGFPE:

Reply via email to