Eric Lee / smarc-ti-linux-kernel

5
Download as
Browse Code ยป

Commit 143cf23df25b7082cd706c3c53188e741e7881c3

Authored by Michael Kerrisk
Committed by Ingo Molnar
1 parent 2b4cfe64de
Exists in ti-lsk-linux-4.1.y and in 12 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y

sched: Make sched_setattr() correctly return -EFBIG 

The documented[1] behavior of sched_attr() in the proposed man page text is:

    sched_attr::size must be set to the size of the structure, as in
    sizeof(struct sched_attr), if the provided structure is smaller
    than the kernel structure, any additional fields are assumed
    '0'. If the provided structure is larger than the kernel structure,
    the kernel verifies all additional fields are '0' if not the
    syscall will fail with -E2BIG.

As currently implemented, sched_copy_attr() returns -EFBIG for
for this case, but the logic in sys_sched_setattr() converts that
error to -EFAULT. This patch fixes the behavior.

[1] http://thread.gmane.org/gmane.linux.kernel/1615615/focus=1697760

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/536CEC17.9070903@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -3658,8 +3658,9 @@
3658 3658 if (!uattr || pid < 0 || flags)
3659 3659 return -EINVAL;
3660 3660  
3661   - if (sched_copy_attr(uattr, &attr))
3662   - return -EFAULT;
  3661 + retval = sched_copy_attr(uattr, &attr);
  3662 + if (retval)
  3663 + return retval;
3663 3664  
3664 3665 rcu_read_lock();
3665 3666 retval = -ESRCH;