Sun Jun 21 11:22:41 2009 UTC ()

Pull up following revision(s) (requested by njoly in ticket #1328):
	sys/compat/linux/common/linux_sched.c: revision 1.59
In linux_sys_sched_getaffinity(), do not leak memory on error.


(bouyer)

diff -r1.37.2.1 -r1.37.2.1.6.1 src/sys/compat/linux/common/linux_sched.c

--- src/sys/compat/linux/common/linux_sched.c 2007/03/28 20:38:41	1.37.2.1
+++ src/sys/compat/linux/common/linux_sched.c 2009/06/21 11:22:41	1.37.2.1.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_sched.c,v 1.37.2.1 2007/03/28 20:38:41 jdc Exp $	*/
+/*	$NetBSD: linux_sched.c,v 1.37.2.1.6.1 2009/06/21 11:22:41 bouyer Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; by Matthias Scheler.
+ *
  * 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
 @@ -32,27 +32,27 @@
  * 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.
  */
 /*
  * Linux compatibility module. Try to deal with scheduler related syscalls.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.37.2.1 2007/03/28 20:38:41 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.37.2.1.6.1 2009/06/21 11:22:41 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/sa.h>
 #include <sys/syscallargs.h>
 #include <sys/wait.h>
 #include <sys/kauth.h>
 #include <sys/ptrace.h>
 @@ -547,32 +547,31 @@ linux_sys_sched_getaffinity(l, v, retval
 	name[0] = CTL_HW;
 	name[1] = HW_NCPU;
 	sz = sizeof(ncpu);
 	if ((error = old_sysctl(&name[0], 2, &ncpu, &sz, NULL, 0, NULL)) != 0)
 		return error;
 	ret = (1 << ncpu) - 1;
 	data = malloc(SCARG(uap, len), M_TEMP, M_WAITOK|M_ZERO);
 	retp = (int *)&data[SCARG(uap, len) - sizeof(ret)];
 	*retp = ret;
-	if ((error = copyout(data, SCARG(uap, mask), SCARG(uap, len))) != 0)
+	error = copyout(data, SCARG(uap, mask), SCARG(uap, len));
 		return error;
 	free(data, M_TEMP);
-	return 0;
+	return error;
+}
 int
 linux_sys_sched_setaffinity(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
+{
 	struct linux_sys_sched_setaffinity_args /* {
 		syscallarg(pid_t) pid;
 		syscallarg(unsigned int) len;
 		syscallarg(unsigned long *) mask;