3.14-stable review patch. If anyone has any objections, please let me know.
------------------ From: Peter Zijlstra <pet...@infradead.org> commit ce5f7f8200ca2504f6f290044393d73ca314965a upstream. The way we read POSIX one should only call sched_getparam() when sched_getscheduler() returns either SCHED_FIFO or SCHED_RR. Given that we currently return sched_param::sched_priority=0 for all others, extend the same behaviour to SCHED_DEADLINE. Requested-by: Michael Kerrisk <mtk.manpa...@gmail.com> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Acked-by: Michael Kerrisk <mtk.manpa...@gmail.com> Cc: Dario Faggioli <raist...@linux.it> Cc: linux-man <linux-...@vger.kernel.org> Cc: "Michael Kerrisk (man-pages)" <mtk.manpa...@gmail.com> Cc: Juri Lelli <juri.le...@gmail.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Link: http://lkml.kernel.org/r/20140512205034.gh13...@laptop.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mi...@kernel.org> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- kernel/sched/core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3735,7 +3735,7 @@ SYSCALL_DEFINE1(sched_getscheduler, pid_ */ SYSCALL_DEFINE2(sched_getparam, pid_t, pid, struct sched_param __user *, param) { - struct sched_param lp; + struct sched_param lp = { .sched_priority = 0 }; struct task_struct *p; int retval; @@ -3752,11 +3752,8 @@ SYSCALL_DEFINE2(sched_getparam, pid_t, p if (retval) goto out_unlock; - if (task_has_dl_policy(p)) { - retval = -EINVAL; - goto out_unlock; - } - lp.sched_priority = p->rt_priority; + if (task_has_rt_policy(p)) + lp.sched_priority = p->rt_priority; rcu_read_unlock(); /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
