From 9d895d273374eaff1e6a671badf3d8397f8711b2 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 26 Apr 2024 04:44:43 +0000 Subject: [PATCH] fix signal test; ok tb@ --- regress/sys/kern/pledge/generic/manager.c | 4 ++-- regress/sys/kern/pledge/generic/tests.out | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/regress/sys/kern/pledge/generic/manager.c b/regress/sys/kern/pledge/generic/manager.c index 1f4225e1a13..207923bc24f 100644 --- a/regress/sys/kern/pledge/generic/manager.c +++ b/regress/sys/kern/pledge/generic/manager.c @@ -1,4 +1,4 @@ -/* $OpenBSD: manager.c,v 1.7 2017/12/15 14:45:51 bluhm Exp $ */ +/* $OpenBSD: manager.c,v 1.8 2024/04/26 04:44:43 jsg Exp $ */ /* * Copyright (c) 2015 Sebastien Marie * @@ -330,7 +330,7 @@ _start_test(int *ret, const char *test_name, const char *request, } /* grab pledged syscall from dmesg */ - if ((signal == SIGKILL) || (signal = SIGABRT)) { + if (signal == SIGKILL || signal == SIGABRT) { int syscall = grab_syscall(pid); switch (syscall) { case -1: /* error */ diff --git a/regress/sys/kern/pledge/generic/tests.out b/regress/sys/kern/pledge/generic/tests.out index 0a4be8c28b6..44c1bb46f8f 100644 --- a/regress/sys/kern/pledge/generic/tests.out +++ b/regress/sys/kern/pledge/generic/tests.out @@ -1,4 +1,4 @@ -# $OpenBSD: tests.out,v 1.13 2017/02/19 19:59:12 tb Exp $ +# $OpenBSD: tests.out,v 1.14 2024/04/26 04:44:43 jsg Exp $ test(test_nop): pledge=("",NULL) status=0 exit=0 test(test_inet): pledge=("",NULL) status=134 signal=6 coredump=present pledged_syscall=97 test(test_inet): pledge=("abort",NULL) status=5632 exit=22 (errno: "Invalid argument") @@ -6,7 +6,7 @@ test(test_inet): pledge=("stdio",NULL) status=134 signal=6 coredump=present pled test(test_inet): pledge=("inet",NULL) status=134 signal=6 coredump=present pledged_syscall=6 test(test_inet): pledge=("stdio inet",NULL) status=0 exit=0 test(test_kill): pledge=("fattr",NULL) status=134 signal=6 coredump=present pledged_syscall=122 -test(test_kill): pledge=("stdio",NULL) status=2 signal=2 pledged_syscall=not_found +test(test_kill): pledge=("stdio",NULL) status=2 signal=2 test(test_rpath): pledge=("stdio rpath",NULL) status=0 exit=0 test(test_wpath): pledge=("stdio wpath",NULL) status=0 exit=0 test(test_cpath): pledge=("cpath",NULL) status=0 exit=0 -- 2.20.1