summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-24 03:18:36 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 07:33:30 -0800
commitd3561f78fd379a7110e46c87964ba7aa4120235c (patch)
tree3f055910e42abf0d2d312bf3feda79dd6798f76e /kernel
parente0661111e5441995f7a69dc4336c9f131cb9bc58 (diff)
downloadlinux-sh-d3561f78fd379a7110e46c87964ba7aa4120235c.tar.gz
[PATCH] RLIMIT_CPU: document wrong return value
Document the fact that setrlimit(RLIMIT_CPU) doesn't return error codes when it should. I don't think we can fix this without a 2.7.x.. Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Ulrich Weigand <uweigand@de.ibm.com> Cc: Cliff Wickman <cpw@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sys.c7
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)
if (resource != RLIMIT_CPU)
goto out;
+
+ /*
+ * RLIMIT_CPU handling. Note that the kernel fails to return an error
+ * code if it rejected the user's attempt to set RLIMIT_CPU. This is a
+ * very long-standing error, and fixing it now risks breakage of
+ * applications, so we live with it
+ */
if (new_rlim.rlim_cur == RLIM_INFINITY)
goto out;