proc: fix reported unit for RLIMIT_CPU
PATCH 1/1 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 <[email protected]>
--- fs/proc/base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/proc/base.c +1 -1
@@ -461,7 +461,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" },
Signature · 5 lines
1.6.3.3 -- Kees Cook Ubuntu Security Team
Quoted 10 lines · Kees Cook
/proc/$pid/limitsshould showRLIMIT_CPUas seconds, which is the unit used inkernel/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 <[email protected]>
Acked-by WANG Cong <[email protected]>
Quoted 28 lines
---
fs/proc/base.c| 2 +-1 files changed, 1 insertions(+), 1 deletions(-)fs/proc/base.c +1
-1@@ -461,7 +461,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" },Signature · 10 lines
1.6.3.3 -- Kees Cook Ubuntu Security Team -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 19 lines · Kees Cook
/proc/$pid/limitsshould showRLIMIT_CPUas seconds, which is the unit used inkernel/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 <[email protected]>--- fs/proc/base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)fs/proc/base.c +0
-0
fs/proc/base.c struct limit_names { · line 467
Quoted 8 lines
fs/proc/base.c +1
-1@@ -461,7 +461,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" },
Yup, thanks!
Acked-by Neil Horman <[email protected]>