From owner-p4-projects@FreeBSD.ORG  Sat Sep 30 09:36:38 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B92AE16A416; Sat, 30 Sep 2006 09:36:38 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 924DF16A403
	for <perforce@FreeBSD.org>; Sat, 30 Sep 2006 09:36:38 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 60E3F43D49
	for <perforce@FreeBSD.org>; Sat, 30 Sep 2006 09:36:38 +0000 (GMT)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8U9acmg039361
	for <perforce@FreeBSD.org>; Sat, 30 Sep 2006 09:36:38 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8U9abJb039358
	for perforce@freebsd.org; Sat, 30 Sep 2006 09:36:37 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 30 Sep 2006 09:36:37 GMT
Message-Id: <200609300936.k8U9abJb039358@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 106967 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Sep 2006 09:36:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=106967

Change 106967 by rdivacky@rdivacky_witten on 2006/09/30 09:36:25

	Check the status of the options before messing with it.

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#4 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#4 (text+ko) ====

@@ -795,6 +795,12 @@
 		printf(ARGS(waitpid, "%d, %p, %d"),
 		    args->pid, (void *)args->status, args->options);
 #endif
+	/* 
+	 * this is necessary because the test in kern_wait doesnt
+	 * work because we mess with the options here
+	 */
+	if (args->options &~ (WUNTRACED|WNOHANG|WCONTINUED))
+	   	return (EINVAL);
 
 	options = (args->options & (WNOHANG | WUNTRACED));
 	/* WLINUXCLONE should be equal to __WCLONE, but we make sure */