diff options
| author | David Howells <dhowells@redhat.com> | 2008-08-21 01:37:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 09:50:23 +0200 |
| commit | ee974e01e5ef2914036f08c8e41d1a3fa8bfc9d9 (patch) | |
| tree | 6d3c7bed6467837bdd8247b01e6f92d792bdd58c /drivers/clocksource | |
| parent | Linux v2.6.27-rc4 (diff) | |
| download | linux-ee974e01e5ef2914036f08c8e41d1a3fa8bfc9d9.tar.xz linux-ee974e01e5ef2914036f08c8e41d1a3fa8bfc9d9.zip | |
clocksource: check range
Check that the value being passed to parse_pmtmr() does not exceed the
limits of pmtmr_ioport.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/acpi_pm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 5ca1d80de182..3df338481004 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -226,9 +226,12 @@ static int __init parse_pmtmr(char *arg) if (strict_strtoul(arg, 16, &base)) return -EINVAL; - +#ifdef CONFIG_X86_64 + if (base > UINT_MAX) + return -ERANGE; +#endif printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n", - (unsigned int)pmtmr_ioport, base); + pmtmr_ioport, base); pmtmr_ioport = base; return 1; |