From: Guenter Roeck <linux@roeck-us.net>
To: Chen Jun <chenjun102@huawei.com>
Cc: linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org,
wim@linux-watchdog.org, haokexin@gmail.com, xuqiang36@huawei.com
Subject: Re: [PATCH] watchdog: Fix kmemleak in watchdog_cdev_register
Date: Wed, 16 Nov 2022 05:52:29 -0800 [thread overview]
Message-ID: <20221116135229.GA3498904@roeck-us.net> (raw)
In-Reply-To: <20221116012714.102066-1-chenjun102@huawei.com>
On Wed, Nov 16, 2022 at 01:27:14AM +0000, Chen Jun wrote:
> kmemleak reports memory leaks in watchdog_dev_register, as follows:
> unreferenced object 0xffff888116233000 (size 2048):
> comm ""modprobe"", pid 28147, jiffies 4353426116 (age 61.741s)
> hex dump (first 32 bytes):
> 80 fa b9 05 81 88 ff ff 08 30 23 16 81 88 ff ff .........0#.....
> 08 30 23 16 81 88 ff ff 00 00 00 00 00 00 00 00 .0#.............
> backtrace:
> [<000000007f001ffd>] __kmem_cache_alloc_node+0x157/0x220
> [<000000006a389304>] kmalloc_trace+0x21/0x110
> [<000000008d640eea>] watchdog_dev_register+0x4e/0x780 [watchdog]
> [<0000000053c9f248>] __watchdog_register_device+0x4f0/0x680 [watchdog]
> [<00000000b2979824>] watchdog_register_device+0xd2/0x110 [watchdog]
> [<000000001f730178>] 0xffffffffc10880ae
> [<000000007a1a8bcc>] do_one_initcall+0xcb/0x4d0
> [<00000000b98be325>] do_init_module+0x1ca/0x5f0
> [<0000000046d08e7c>] load_module+0x6133/0x70f0
> ...
>
> unreferenced object 0xffff888105b9fa80 (size 16):
> comm ""modprobe"", pid 28147, jiffies 4353426116 (age 61.741s)
> hex dump (first 16 bytes):
> 77 61 74 63 68 64 6f 67 31 00 b9 05 81 88 ff ff watchdog1.......
> backtrace:
> [<000000007f001ffd>] __kmem_cache_alloc_node+0x157/0x220
> [<00000000486ab89b>] __kmalloc_node_track_caller+0x44/0x1b0
> [<000000005a39aab0>] kvasprintf+0xb5/0x140
> [<0000000024806f85>] kvasprintf_const+0x55/0x180
> [<000000009276cb7f>] kobject_set_name_vargs+0x56/0x150
> [<00000000a92e820b>] dev_set_name+0xab/0xe0
> [<00000000cec812c6>] watchdog_dev_register+0x285/0x780 [watchdog]
> [<0000000053c9f248>] __watchdog_register_device+0x4f0/0x680 [watchdog]
> [<00000000b2979824>] watchdog_register_device+0xd2/0x110 [watchdog]
> [<000000001f730178>] 0xffffffffc10880ae
> [<000000007a1a8bcc>] do_one_initcall+0xcb/0x4d0
> [<00000000b98be325>] do_init_module+0x1ca/0x5f0
> [<0000000046d08e7c>] load_module+0x6133/0x70f0
> ...
>
> The reason is that put_device is not be called if cdev_device_add fails
> and wdd->id != 0.
>
> watchdog_cdev_register
> wd_data = kzalloc [1]
> err = dev_set_name [2]
> ..
> err = cdev_device_add
> if (err) {
> if (wdd->id == 0) { // wdd->id != 0
> ..
> }
> return err; // [1],[2] would be leaked
>
> To fix it, call put_device in all wdd->id cases.
>
> Fixes: 72139dfa2464 ("watchdog: Fix the race between the release of watchdog_core_data and cdev")
> Signed-off-by: Chen Jun <chenjun102@huawei.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/watchdog_dev.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 55574ed42504..fdffa6859dde 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -1061,8 +1061,8 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)
> if (wdd->id == 0) {
> misc_deregister(&watchdog_miscdev);
> old_wd_data = NULL;
> - put_device(&wd_data->dev);
> }
> + put_device(&wd_data->dev);
> return err;
> }
>
> --
> 2.17.1
>
prev parent reply other threads:[~2022-11-16 13:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 1:27 Chen Jun
2022-11-16 13:52 ` Guenter Roeck [this message]
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221116135229.GA3498904@roeck-us.net \
--to=linux@roeck-us.net \
--cc=chenjun102@huawei.com \
--cc=haokexin@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@linux-watchdog.org \
--cc=xuqiang36@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®