Module Name: src
Committed By: thorpej
Date: Wed Apr 29 01:53:48 UTC 2020
Modified Files:
src/sys/kern: sys_sched.c
Log Message:
Sanitize the pid and lid arguments passed to do_sched_getparam()
and sys__sched_getaffinity() now that -1 as the pid argument to
lwp_find2() means "wildcard proc".
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/sys_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_sched.c
diff -u src/sys/kern/sys_sched.c:1.47 src/sys/kern/sys_sched.c:1.48
--- src/sys/kern/sys_sched.c:1.47 Mon Jan 27 22:05:10 2020
+++ src/sys/kern/sys_sched.c Wed Apr 29 01:53:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sched.c,v 1.47 2020/01/27 22:05:10 ad Exp $ */
+/* $NetBSD: sys_sched.c,v 1.48 2020/04/29 01:53:48 thorpej Exp $ */
/*
* Copyright (c) 2008, 2011 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.47 2020/01/27 22:05:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_sched.c,v 1.48 2020/04/29 01:53:48 thorpej Exp $");
#include <sys/param.h>
@@ -231,6 +231,9 @@ do_sched_getparam(pid_t pid, lwpid_t lid
struct lwp *t;
int error, lpolicy;
+ if (pid < 0 || lid < 0)
+ return EINVAL;
+
t = lwp_find2(pid, lid); /* acquire p_lock */
if (t == NULL)
return ESRCH;
@@ -498,6 +501,9 @@ sys__sched_getaffinity(struct lwp *l,
kcpuset_t *kcset;
int error;
+ if (SCARG(uap, pid) < 0 || SCARG(uap, lid) < 0)
+ return EINVAL;
+
error = genkcpuset(&kcset, SCARG(uap, cpuset), SCARG(uap, size));
if (error)
return error;