]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
watchdog: ts4800_wdt: Fix refcount leak in ts4800_wdt_probe
authorMiaoqian Lin <linmq006@gmail.com>
Wed, 11 May 2022 11:42:03 +0000 (15:42 +0400)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 26 Aug 2022 08:52:45 +0000 (10:52 +0200)
BugLink: https://bugs.launchpad.net/bugs/1982968
[ Upstream commit 5d24df3d690809952528e7a19a43d84bc5b99d44 ]

of_parse_phandle() returns a node pointer with refcount
incremented, we should use of_node_put() on it when done.
Add  missing of_node_put() in some error paths.

Fixes: bf9006399939 ("watchdog: ts4800: add driver for TS-4800 watchdog")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220511114203.47420-1-linmq006@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/watchdog/ts4800_wdt.c

index c137ad2bd5c31616f4259a528bc713ec193ab616..0ea554c7cda579320e56e36ae27a21a5a13f2665 100644 (file)
@@ -125,13 +125,16 @@ static int ts4800_wdt_probe(struct platform_device *pdev)
        ret = of_property_read_u32_index(np, "syscon", 1, &reg);
        if (ret < 0) {
                dev_err(dev, "no offset in syscon\n");
+               of_node_put(syscon_np);
                return ret;
        }
 
        /* allocate memory for watchdog struct */
        wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
-       if (!wdt)
+       if (!wdt) {
+               of_node_put(syscon_np);
                return -ENOMEM;
+       }
 
        /* set regmap and offset to know where to write */
        wdt->feed_offset = reg;