GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-30 02:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-watchdog 6.1-rc4 tag

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iEYEABECAAYFAmNg1YcACgkQ+iyteGJfRsoBNQCgyixgNdLK31WFtoanRlo++KuO
 4csAnjnJ0BdMwJj13TBfv3B107RYpxrd
 =L7M+
 -----END PGP SIGNATURE-----

Merge tag 'linux-watchdog-6.1-rc4' of git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:

 - fix use after free in exar driver

 - spelling fix in comment

* tag 'linux-watchdog-6.1-rc4' of git://www.linux-watchdog.org/linux-watchdog:
  drivers: watchdog: exar_wdt.c fix use after free
  watchdog: sp805_wdt: fix spelling typo in comment
This commit is contained in:
Linus Torvalds 2022-11-01 12:21:53 -07:00
commit d79dcde0bc
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/watchdog/exar_wdt.c
View file

@ -355,8 +355,10 @@ static int __init exar_wdt_register(struct wdt_priv *priv, const int idx)
&priv->wdt_res, 1, &priv->wdt_res, 1,
priv, sizeof(*priv)); priv, sizeof(*priv));
if (IS_ERR(n->pdev)) { if (IS_ERR(n->pdev)) {
int err = PTR_ERR(n->pdev);
kfree(n); kfree(n);
return PTR_ERR(n->pdev); return err;
} }
list_add_tail(&n->list, &pdev_list); list_add_tail(&n->list, &pdev_list);

2
drivers/watchdog/sp805_wdt.c
View file

@ -88,7 +88,7 @@ static bool wdt_is_running(struct watchdog_device *wdd)
return (wdtcontrol & ENABLE_MASK) == ENABLE_MASK; return (wdtcontrol & ENABLE_MASK) == ENABLE_MASK;
} }
/* This routine finds load value that will reset system in required timout */ /* This routine finds load value that will reset system in required timeout */
static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout) static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
{ {
struct sp805_wdt *wdt = watchdog_get_drvdata(wdd); struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);