tests: fix remaining test failures under _FORTIFY_SOURCE
The getgroups test is a NetBSD tests, so just apply our larger hammer and disable the feature entirely. The audit test can take a more surgical approach and use __ssp_real() appropriately, since it's a local one. PR: 294881 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56735
This commit is contained in:
@@ -75,6 +75,13 @@ __ssp_redirect_raw_impl(char *, gets_s, gets_s,
|
||||
}
|
||||
|
||||
retbuf = __ssp_real(gets_s)(buf, len);
|
||||
|
||||
/*
|
||||
* If the implementation did *not* handle the case correctly, then
|
||||
* there's a risk that they could have corrupted us into not failing
|
||||
* here. We have tests that cover this, so we'll just count on finding
|
||||
* a broken implementation early on in a less hostile environmnt.
|
||||
*/
|
||||
if (need_fail && retbuf != NULL)
|
||||
__chk_fail();
|
||||
return (retbuf);
|
||||
|
||||
@@ -22,6 +22,7 @@ NETBSD_ATF_TESTS_C+= dup_test
|
||||
NETBSD_ATF_TESTS_C+= fsync_test
|
||||
NETBSD_ATF_TESTS_C+= getcontext_test
|
||||
NETBSD_ATF_TESTS_C+= getgroups_test
|
||||
FORTIFY_SOURCE.t_getgroups.c= 0
|
||||
NETBSD_ATF_TESTS_C+= getitimer_test
|
||||
NETBSD_ATF_TESTS_C+= getlogin_test
|
||||
NETBSD_ATF_TESTS_C+= getpid_test
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
#include <sys/uio.h>
|
||||
#include <sys/un.h>
|
||||
|
||||
#include <ssp/ssp.h>
|
||||
|
||||
#include <atf-c.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdarg.h>
|
||||
@@ -959,7 +961,7 @@ ATF_TC_BODY(recvmsg_failure, tc)
|
||||
snprintf(extregex, sizeof(extregex),
|
||||
"recvmsg.*return,failure : Bad address");
|
||||
FILE *pipefd = setup(fds, auclass);
|
||||
ATF_REQUIRE_EQ(-1, recvmsg(-1, NULL, 0));
|
||||
ATF_REQUIRE_EQ(-1, __ssp_real(recvmsg)(-1, NULL, 0));
|
||||
check_audit(fds, extregex, pipefd);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user