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>
This commit is contained in:
parent
27f6cb160b
commit
cff4edb591
|
@ -458,7 +458,7 @@ struct limit_names {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct limit_names lnames[RLIM_NLIMITS] = {
|
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_FSIZE] = {"Max file size", "bytes"},
|
||||||
[RLIMIT_DATA] = {"Max data size", "bytes"},
|
[RLIMIT_DATA] = {"Max data size", "bytes"},
|
||||||
[RLIMIT_STACK] = {"Max stack size", "bytes"},
|
[RLIMIT_STACK] = {"Max stack size", "bytes"},
|
||||||
|
|
Loading…
Reference in a new issue