kernel/signal.c: add compile-time check for __ARCH_SI_PREAMBLE_SIZE

[linux-2.6-block.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 78947de6f9691e898adf3803ec59fded4a0a28da..cf8ba545c7d3ba6feda038455d75d1931194f3e9 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2169,7 +2169,10 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                error = perf_event_task_enable();
                break;
        case PR_GET_TIMERSLACK:
-               error = current->timer_slack_ns;
+               if (current->timer_slack_ns > ULONG_MAX)
+                       error = ULONG_MAX;
+               else
+                       error = current->timer_slack_ns;
                break;
        case PR_SET_TIMERSLACK:
                if (arg2 <= 0)