Commit bdbb4a2d authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: intel_oc_wdt: Do not try to write into const memory 



The code tries to update the intel_oc_wdt_info data structure if the
watchdog is locked. That data structure is marked as const and can not
be written into. Copy it into struct intel_oc_wdt and modify it there
to fix the problem.

Reported-by: default avatarPetar Kulić <cooleech@gmail.com>
Cc: Diogo Ivo <diogo.ivo@siemens.com>
Fixes: 535d1784 ("watchdog: Add driver for Intel OC WDT")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarDiogo Ivo <diogo.ivo@siemens.com>
Tested-by: default avatarDiogo Ivo <diogo.ivo@siemens.com>
Link: https://lore.kernel.org/linux-watchdog/20250818031838.3359-1-diogo.ivo@tecnico.ulisboa.pt/T/#t


Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent f777d111

drivers/watchdog/intel_oc_wdt.c

+4 −4
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
struct intel_oc_wdt {

	struct watchdog_device wdd;

	struct resource *ctrl_res;

	struct watchdog_info info;

	bool locked;

};
@@ -115,7 +116,6 @@ static const struct watchdog_ops intel_oc_wdt_ops = { 


static int intel_oc_wdt_setup(struct intel_oc_wdt *oc_wdt)

{

	struct watchdog_info *info;

	unsigned long val;



	val = inl(INTEL_OC_WDT_CTRL_REG(oc_wdt));
@@ -134,7 +134,6 @@ static int intel_oc_wdt_setup(struct intel_oc_wdt *oc_wdt) 
		set_bit(WDOG_HW_RUNNING, &oc_wdt->wdd.status);



		if (oc_wdt->locked) {

			info = (struct watchdog_info *)&intel_oc_wdt_info;

			/*

			 * Set nowayout unconditionally as we cannot stop

			 * the watchdog.
@@ -145,7 +144,7 @@ static int intel_oc_wdt_setup(struct intel_oc_wdt *oc_wdt) 
			 * and inform the core we can't change it.

			 */

			oc_wdt->wdd.timeout = (val & INTEL_OC_WDT_TOV) + 1;

			info->options &= ~WDIOF_SETTIMEOUT;

			oc_wdt->info.options &= ~WDIOF_SETTIMEOUT;



			dev_info(oc_wdt->wdd.parent,

				 "Register access locked, heartbeat fixed at: %u s\n",
@@ -193,7 +192,8 @@ static int intel_oc_wdt_probe(struct platform_device *pdev) 
	wdd->min_timeout = INTEL_OC_WDT_MIN_TOV;

	wdd->max_timeout = INTEL_OC_WDT_MAX_TOV;

	wdd->timeout = INTEL_OC_WDT_DEF_TOV;

	wdd->info = &intel_oc_wdt_info;

	oc_wdt->info = intel_oc_wdt_info;

	wdd->info = &oc_wdt->info;

	wdd->ops = &intel_oc_wdt_ops;

	wdd->parent = dev;