diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2008-05-13 10:27:17 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:45:36 +0200 |
| commit | 30e0e178193d4221abc9926b07a4c7661c7cc4a9 (patch) | |
| tree | f6ad7d54e810a97345ad82b55832a2dbfb3ca6e2 /kernel | |
| parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) | |
| download | linux-30e0e178193d4221abc9926b07a4c7661c7cc4a9.tar.gz linux-30e0e178193d4221abc9926b07a4c7661c7cc4a9.tar.bz2 linux-30e0e178193d4221abc9926b07a4c7661c7cc4a9.zip | |
cpuset: limit the input of cpuset.sched_relax_domain_level
We allow the inputs to be [-1 ... SD_LV_MAX), and return -EINVAL
for inputs outside this range.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Paul Menage <menage@google.com>
Acked-by: Paul Jackson <pj@sgi.com>
Acked-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 4 | ||||
| -rw-r--r-- | kernel/sched.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 039baa4cd90c..66103a119bfe 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1037,8 +1037,8 @@ int current_cpuset_is_being_rebound(void) static int update_relax_domain_level(struct cpuset *cs, s64 val) { - if ((int)val < 0) - val = -1; + if (val < -1 || val >= SD_LV_MAX) + return -EINVAL; if (val != cs->relax_domain_level) { cs->relax_domain_level = val; diff --git a/kernel/sched.c b/kernel/sched.c index eaf6751e7612..bb2c699c9f5e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6877,7 +6877,12 @@ static int default_relax_domain_level = -1; static int __init setup_relax_domain_level(char *str) { - default_relax_domain_level = simple_strtoul(str, NULL, 0); + unsigned long val; + + val = simple_strtoul(str, NULL, 0); + if (val < SD_LV_MAX) + default_relax_domain_level = val; + return 1; } __setup("relax_domain_level=", setup_relax_domain_level); |