[linux-yocto] [4.12][PATCH] ACPI / watchdog: Fix off-by-one error at resource assignment

[Bruce Ashfield]

merged.

Bruce

On 05/08/2018 05:30 AM, Liwei Song wrote:
> From: Takashi Iwai <tiwai at suse.de>
> 
> commit b1abf6fc49829d89660c961fafe3f90f3d843c55 upstream.
> 
> The resource allocation in WDAT watchdog has off-one-by error, it sets
> one byte more than the actual end address.  This may eventually lead
> to unexpected resource conflicts.
> 
> Fixes: 058dfc767008 (ACPI / watchdog: Add support for WDAT hardware watchdog)
> Cc: 4.9+ <stable at vger.kernel.org> # 4.9+
> Signed-off-by: Takashi Iwai <tiwai at suse.de>
> Acked-by: Mika Westerberg <mika.westerberg at linux.intel.com>
> Acked-by: Guenter Roeck <linux at roeck-us.net>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
> Signed-off-by: Liwei Song <liwei.song at windriver.com>
> ---
>   drivers/acpi/acpi_watchdog.c | 4 ++--
>   drivers/watchdog/wdat_wdt.c  | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
> index 8c4e0a18460a..87648aa645ba 100644
> --- a/drivers/acpi/acpi_watchdog.c
> +++ b/drivers/acpi/acpi_watchdog.c
> @@ -74,10 +74,10 @@ void __init acpi_watchdog_init(void)
>   		res.start = gas->address;
>   		if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
>   			res.flags = IORESOURCE_MEM;
> -			res.end = res.start + ALIGN(gas->access_width, 4);
> +			res.end = res.start + ALIGN(gas->access_width, 4) - 1;
>   		} else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
>   			res.flags = IORESOURCE_IO;
> -			res.end = res.start + gas->access_width;
> +			res.end = res.start + gas->access_width - 1;
>   		} else {
>   			pr_warn("Unsupported address space: %u\n",
>   				gas->space_id);
> diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
> index 6d1fbda0f461..0da9943d405f 100644
> --- a/drivers/watchdog/wdat_wdt.c
> +++ b/drivers/watchdog/wdat_wdt.c
> @@ -392,7 +392,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
>   
>   		memset(&r, 0, sizeof(r));
>   		r.start = gas->address;
> -		r.end = r.start + gas->access_width;
> +		r.end = r.start + gas->access_width - 1;
>   		if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
>   			r.flags = IORESOURCE_MEM;
>   		} else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
>