hung_task: change sysctl_hung_task_check_count to int
Subsystems (2)
PATCH v2 1/1 hung_task: change sysctl_hung_task_check_count to int
As sysctl_hung_task_check_count is unsigned long, when this value is assigned to max_count in check_hung_uninterruptible_tasks(), it's truncated to int type.
Therefore if we write 2^32 to sysctl.hung_task_check_count, hung task detection will be effectively disabled.
With this fix, it will still truncate the user input, but reading sysctl.hung_task_check_count reflects the truncated value.
v2: limit lowest value to 0.
--- include/linux/sched/sysctl.h | 2 +- kernel/hung_task.c | 2 +- kernel/sysctl.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)
include/linux/sched/sysctl.h +1 -1
@@ -2,8 +2,8 @@#define _SCHED_SYSCTL_H#ifdef CONFIG_DETECT_HUNG_TASK +extern int sysctl_hung_task_check_count;extern unsigned int sysctl_hung_task_panic; -extern unsigned long sysctl_hung_task_check_count;extern unsigned long sysctl_hung_task_timeout_secs;extern unsigned long sysctl_hung_task_warnings; extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
kernel/hung_task.c +1 -1
@@ -20,7 +20,7 @@/* * The number of tasks checked: */ -unsigned long __read_mostly sysctl_hung_task_check_count =PID_MAX_LIMIT ; +int __read_mostly sysctl_hung_task_check_count =PID_MAX_LIMIT ;/* * Limit number of tasks checked in a batch.
kernel/sysctl.c +3 -2
@@ -962,9 +962,10 @@ static struct ctl_table kern_table[] = { { .procname = "hung_task_check_count", .data = &sysctl_hung_task_check_count, - .maxlen = sizeof(unsigned long), + .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_doulongvec_minmax, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, }, { .procname = "hung_task_timeout_secs",
Signature · 1 line
1.8.0.2
tip-bot for Li Zefan
merge bot[tip:core/locking] hung_task: Change sysctl_hung_task_check_count to 'int'
hung_task: Change sysctl_hung_task_check_count to 'int'
Commit-ID: cd64647f043e3fd3569bcf068f47f030198ff93a Gitweb: http://git.kernel.org/tip/cd64647f043e3fd3569bcf068f47f030198ff93a Author: Li Zefan <[email protected]> AuthorDate: Mon, 23 Sep 2013 16:43:58 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 23 Sep 2013 11:10:49 +0200
hung_task: Change sysctl_hung_task_check_count to 'int'
As 'sysctl_hung_task_check_count' is 'unsigned long' when this value is assigned to max_count in check_hung_uninterruptible_tasks(), it's truncated to 'int' type.
This causes a minor artifact: if we write 2^32 to sysctl.hung_task_check_count, hung task detection will be effectively disabled.
With this fix, it will still truncate the user input to 32 bits, but reading sysctl.hung_task_check_count reflects the actual truncated value.
--- include/linux/sched/sysctl.h | 2 +- kernel/hung_task.c | 2 +- kernel/sysctl.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)
include/linux/sched/sysctl.h +1 -1
@@ -2,8 +2,8 @@#define _SCHED_SYSCTL_H#ifdef CONFIG_DETECT_HUNG_TASK +extern int sysctl_hung_task_check_count;extern unsigned int sysctl_hung_task_panic; -extern unsigned long sysctl_hung_task_check_count;extern unsigned long sysctl_hung_task_timeout_secs;extern unsigned long sysctl_hung_task_warnings; extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
kernel/hung_task.c +1 -1
@@ -20,7 +20,7 @@/* * The number of tasks checked: */ -unsigned long __read_mostly sysctl_hung_task_check_count =PID_MAX_LIMIT ; +int __read_mostly sysctl_hung_task_check_count =PID_MAX_LIMIT ;/* * Limit number of tasks checked in a batch.
kernel/sysctl.c +3 -2
@@ -962,9 +962,10 @@ static struct ctl_table kern_table[] = { { .procname = "hung_task_check_count", .data = &sysctl_hung_task_check_count, - .maxlen = sizeof(unsigned long), + .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_doulongvec_minmax, + .proc_handler = proc_dointvec_minmax, + .extra1 = &zero, }, { .procname = "hung_task_timeout_secs",