diff options
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 9e157e0240d4..19d058be49d4 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -1656,6 +1656,13 @@ asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *rlim) | |||
1656 | 1656 | ||
1657 | if (resource != RLIMIT_CPU) | 1657 | if (resource != RLIMIT_CPU) |
1658 | goto out; | 1658 | goto out; |
1659 | |||
1660 | /* | ||
1661 | * RLIMIT_CPU handling. Note that the kernel fails to return an error | ||
1662 | * code if it rejected the user's attempt to set RLIMIT_CPU. This is a | ||
1663 | * very long-standing error, and fixing it now risks breakage of | ||
1664 | * applications, so we live with it | ||
1665 | */ | ||
1659 | if (new_rlim.rlim_cur == RLIM_INFINITY) | 1666 | if (new_rlim.rlim_cur == RLIM_INFINITY) |
1660 | goto out; | 1667 | goto out; |
1661 | 1668 | ||