LKML Archive on
help / color / mirror / Atom feed
From: Christophe JAILLET <>
	Christophe JAILLET <>
Subject: [PATCH] watchdog: Fix an invalid memory access in 'watchdog_cdev_unregister()'
Date: Thu, 29 Jul 2021 18:16:58 +0200	[thread overview]
Message-ID: <> (raw)

A few lines before 'watchdog_hrtimer_pretimeout_stop(wdd)', we explicitly
set 'wdd->wd_data' to NULL.
So, it is more than likely than this call will lead to an invalid
memory access.

Move this call before the 'wdd->wd_data = NULL;'

Fixes: 7b7d2fdc8c3e ("watchdog: Add hrtimer-based pretimeout feature")
Signed-off-by: Christophe JAILLET <>
Completely untested!
Not sure at all, that it is the way to fix it.
 drivers/watchdog/watchdog_dev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 3bab32485273..ffd8f1a82355 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -1096,6 +1096,8 @@ static void watchdog_cdev_unregister(struct watchdog_device *wdd)
+	watchdog_hrtimer_pretimeout_stop(wdd);
 	wd_data->wdd = NULL;
 	wdd->wd_data = NULL;
@@ -1103,7 +1105,6 @@ static void watchdog_cdev_unregister(struct watchdog_device *wdd)
-	watchdog_hrtimer_pretimeout_stop(wdd);

             reply	other threads:[~2021-07-29 16:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29 16:16 Christophe JAILLET [this message]
2021-07-29 16:27 ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \
    --subject='Re: [PATCH] watchdog: Fix an invalid memory access in '\''watchdog_cdev_unregister()'\''' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).