Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Guenter Roeck <groeck7@gmail.com>
Subject: Re: [PATCH -next] watchdog: Fix possible use-after-free in
 wdt_startup()
To:     Zou Wei <zou_wei@huawei.com>, wim@linux-watchdog.org
Cc:     linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
References: <1620716495-108352-1-git-send-email-zou_wei@huawei.com>
From:   Guenter Roeck <linux@roeck-us.net>
Message-ID: <3862c1d1-dd78-0b80-74c4-5f32a821fbef@roeck-us.net>
Date:   Tue, 11 May 2021 06:36:54 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.1
MIME-Version: 1.0
In-Reply-To: <1620716495-108352-1-git-send-email-zou_wei@huawei.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 5/11/21 12:01 AM, Zou Wei wrote:
> This module's remove path calls del_timer(). However, that function
> does not wait until the timer handler finishes. This means that the
> timer handler may still be running after the driver's remove function
> has finished, which would result in a use-after-free.
> 
> Fix by calling del_timer_sync(), which makes sure the timer handler
> has finished, and unable to re-schedule itself.
> 
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zou Wei <zou_wei@huawei.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/sbc60xxwdt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
> index a947a63..7b97480 100644
> --- a/drivers/watchdog/sbc60xxwdt.c
> +++ b/drivers/watchdog/sbc60xxwdt.c
> @@ -146,7 +146,7 @@ static void wdt_startup(void)
>   static void wdt_turnoff(void)
>   {
>   	/* Stop the timer */
> -	del_timer(&timer);
> +	del_timer_sync(&timer);
>   	inb_p(wdt_stop);
>   	pr_info("Watchdog timer is now disabled...\n");
>   }
>