Commit cff4edb5 authored Sep 22, 2009 by Kees Cook Committed by Linus Torvalds Sep 23, 2009

proc: fix reported unit for RLIMIT_CPU



/proc/$pid/limits should show RLIMIT_CPU as seconds, which is the unit
used in kernel/posix-cpu-timers.c:

        unsigned long psecs = cputime_to_secs(ptime);
        ...
        if (psecs >= sig->rlim[RLIMIT_CPU].rlim_max) {
                ...
                __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 27f6cb16

fs/proc/base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -458,7 +458,7 @@ struct limit_names {
		};

		static const struct limit_names lnames[RLIM_NLIMITS] = {
		[RLIMIT_CPU] = {"Max cpu time", "ms"},
		[RLIMIT_CPU] = {"Max cpu time", "seconds"},
		[RLIMIT_FSIZE] = {"Max file size", "bytes"},
		[RLIMIT_DATA] = {"Max data size", "bytes"},
		[RLIMIT_STACK] = {"Max stack size", "bytes"},

Admin message