Fri Jun 19 21:41:34 2009 UTC ()
Pull up following revision(s) (requested by njoly in ticket #822):
	sys/compat/linux/common/linux_sched.c: revision 1.59
In linux_sys_sched_getaffinity(), do not leak memory on error.


(snj)
diff -r1.58 -r1.58.10.1 src/sys/compat/linux/common/linux_sched.c

cvs diff -r1.58 -r1.58.10.1 src/sys/compat/linux/common/linux_sched.c (expand / switch to context diff)
--- src/sys/compat/linux/common/linux_sched.c 2008/10/25 23:38:28 1.58
+++ src/sys/compat/linux/common/linux_sched.c 2009/06/19 21:41:33 1.58.10.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_sched.c,v 1.58 2008/10/25 23:38:28 christos Exp $	*/
+/*	$NetBSD: linux_sched.c,v 1.58.10.1 2009/06/19 21:41:33 snj Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.58 2008/10/25 23:38:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.58.10.1 2009/06/19 21:41:33 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -646,12 +646,11 @@
 	retp = (int *)&data[SCARG(uap, len) - sizeof(ret)];
 	*retp = ret;
 
-	if ((error = copyout(data, SCARG(uap, mask), SCARG(uap, len))) != 0)
-		return error;
+	error = copyout(data, SCARG(uap, mask), SCARG(uap, len));
 
 	free(data, M_TEMP);
 
-	return 0;
+	return error;
 
 }