d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wait: Do not copyout uninitialized status/rusage/wrusage.

Browse Source 
If wait4() or wait6() return 0 because of WNOHANG, the status, rusage and
wrusage information should not be returned.

PR:		212048
Reported by:	Casey Lucas
MFC after:	2 weeks
This commit is contained in:
jilles 2016-09-09 21:58:48 +00:00
parent 1f03f894b8
commit b8f715c74f
3 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_exit.c
View File

@ -723,9 +723,9 @@ sys_wait4(struct thread *td, struct wait4_args *uap)
else
rup = NULL;
error = kern_wait(td, uap->pid, &status, uap->options, rup);
if (uap->status != NULL && error == 0)
if (uap->status != NULL && error == 0 && td->td_retval[0] != 0)
error = copyout(&status, uap->status, sizeof(status));
if (uap->rusage != NULL && error == 0)
if (uap->rusage != NULL && error == 0 && td->td_retval[0] != 0)
error = copyout(&ru, uap->rusage, sizeof(struct rusage));
return (error);
}
@ -759,9 +759,9 @@ sys_wait6(struct thread *td, struct wait6_args *uap)
*/
error = kern_wait6(td, idtype, id, &status, uap->options, wrup, sip);
if (uap->status != NULL && error == 0)
if (uap->status != NULL && error == 0 && td->td_retval[0] != 0)
error = copyout(&status, uap->status, sizeof(status));
if (uap->wrusage != NULL && error == 0)
if (uap->wrusage != NULL && error == 0 && td->td_retval[0] != 0)
error = copyout(&wru, uap->wrusage, sizeof(wru));
if (uap->info != NULL && error == 0)
error = copyout(&si, uap->info, sizeof(si));

1
tests/sys/kern/Makefile
View File

@ -12,6 +12,7 @@ PLAIN_TESTS_C+= subr_unit_test
ATF_TESTS_C+= unix_seqpacket_test
ATF_TESTS_C+= unix_passfd_test
TEST_METADATA.unix_seqpacket_test+= timeout="15"
ATF_TESTS_C+= waitpid_nohang
LIBADD.ptrace_test+= pthread
LIBADD.unix_seqpacket_test+= pthread

70
tests/sys/kern/waitpid_nohang.c Normal file
View File

@ -0,0 +1,70 @@
/*-
* Copyright (c) 2016 Jilles Tjoelker
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/wait.h>
#include <atf-c.h>
#include <signal.h>
#include <unistd.h>
ATF_TC_WITHOUT_HEAD(waitpid_nohang);
ATF_TC_BODY(waitpid_nohang, tc)
{
pid_t child, pid;
int status, r;
child = fork();
ATF_REQUIRE(child != -1);
if (child == 0) {
sleep(10);
_exit(1);
}
status = 42;
pid = waitpid(child, &status, WNOHANG);
ATF_REQUIRE(pid == 0);
ATF_CHECK(status == 42);
r = kill(child, SIGTERM);
ATF_REQUIRE(r == 0);
r = waitid(P_PID, child, NULL, WEXITED | WNOWAIT);
ATF_REQUIRE(r == 0);
status = -1;
pid = waitpid(child, &status, WNOHANG);
ATF_REQUIRE(pid == child);
ATF_CHECK(WIFSIGNALED(status) && WTERMSIG(status) == SIGTERM);
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, waitpid_nohang);
return (atf_no_error());
}