From 2658175695e748c6a95cd205f7ef140645020879 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Wed, 29 Nov 2023 02:00:48 +0000
Subject: [PATCH] t_setrlimit: Narrow the scope of stack-protector warning
 suppression.

---
 tests/lib/libc/sys/Makefile      |  1 -
 tests/lib/libc/sys/t_setrlimit.c | 25 +++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/tests/lib/libc/sys/Makefile b/tests/lib/libc/sys/Makefile
index 6dd9cc79e672..6ffec531a219 100644
--- a/tests/lib/libc/sys/Makefile
+++ b/tests/lib/libc/sys/Makefile
@@ -158,6 +158,5 @@ CWARNFLAGS.gcc+=	${CC_WNO_ADDRESS_OF_PACKED_MEMBER} \
 
 # Explicitly breaks this
 COPTS.t_wait.c+=	${CC_WNO_ARRAY_BOUNDS} ${CC_WNO_STRINGOP_OVERFLOW}
-COPTS.t_setrlimit.c+=	-Wno-error=stack-protector
 
 .include <bsd.test.mk>
diff --git a/tests/lib/libc/sys/t_setrlimit.c b/tests/lib/libc/sys/t_setrlimit.c
index 854817817805..aa1936dd7ad8 100644
--- a/tests/lib/libc/sys/t_setrlimit.c
+++ b/tests/lib/libc/sys/t_setrlimit.c
@@ -533,6 +533,26 @@ ATF_TC_HEAD(setrlimit_stack_growshrink, tc)
 	    "Test that setrlimit(2), RLIMIT_STACK, grows & shrinks the stack");
 }
 
+/*
+ * checkstackchild(n, expectsegv)
+ *
+ *	Allocate an array of size n on the stack, and verify it can be
+ *	used.  If it can't be used, this will crash with SIGSEGV,
+ *	deliberately.
+ */
+_Pragma("GCC diagnostic push")
+_Pragma("GCC diagnostic ignored \"-Wstack-protector\"")
+static void
+checkstackchild(size_t n)
+{
+	volatile char *const x = alloca(n);
+	size_t i;
+
+	for (i = 0; i < n; i++)
+		x[i] = 0x1a;
+}
+_Pragma("GCC diagnostic pop")
+
 /*
  * checkstack(n, expectsegv)
  *
@@ -555,14 +575,11 @@ static void
 checkstack(size_t n, int expectsegv)
 {
 	pid_t forked, waited;
-	size_t i;
 	int status;
 
 	RL(forked = fork());
 	if (forked == 0) {	/* child */
-		volatile char *const x = alloca(n);
-		for (i = 0; i < n; i++)
-			x[i] = 0x1a;
+		checkstackchild(n);
 		_exit(expectsegv);
 	}