Fix a print format error in the ACPI PM clocksource driver: drivers/clocksource/acpi_pm.c:231: warning: format '%04lx' expects type 'long unsigned int', but argument 2 has type 'u32' This was introduced in patch 6b148507d3d042a3c11f4c3f6c0f649c6a89220d. And check that the value being passed to parse_pmtmr() does not exceed the limits of pmtmr_ioport. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> --- drivers/clocksource/acpi_pm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 3baee02..71f2dc2 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c @@ -227,7 +227,12 @@ static int __init parse_pmtmr(char *arg) if (strict_strtoul(arg, 16, &base)) return -EINVAL; - printk(KERN_INFO "PMTMR IOPort override: 0x%04lx -> 0x%04lx\n", +#ifdef CONFIG_X86_64 + if (base > UINT_MAX) + return -ERANGE; +#endif + + printk(KERN_INFO "PMTMR IOPort override: 0x%04x -> 0x%04lx\n", pmtmr_ioport, base); pmtmr_ioport = base; -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
