From: Vladimir Zapolskiy <vz@mleia.com>
To: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Dmitry Osipenko" <digetx@gmail.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 5/7] regulator: plug of_node leak in regulator_register()'s error path
Date: Wed, 12 Aug 2020 09:29:12 +0300 [thread overview]
Message-ID: <cddd3d73-8666-d64b-34f5-d82a3b31cf36@mleia.com> (raw)
In-Reply-To: <f5035b1b4d40745e66bacd571bbbb5e4644d21a1.1597195321.git.mirq-linux@rere.qmqm.pl>
Hi Michał,
On 8/12/20 4:31 AM, Michał Mirosław wrote:
> By calling device_initialize() earlier and noting that kfree(NULL) is
> ok, we can save a bit of code in error handling and plug of_node leak.
> Fixed commit already did part of the work.
>
> Cc: stable@vger.kernel.org
> Fixes: 9177514ce349 ("regulator: fix memory leak on error path of regulator_register()")
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Vladimir Zapolskiy <vz@mleia.com>
> ---
> drivers/regulator/core.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index 71749f48caee..448a267641df 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -5137,6 +5137,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
> ret = -ENOMEM;
> goto rinse;
> }
> + device_initialize(&rdev->dev);
>
> /*
> * Duplicate the config so the driver could override it after
> @@ -5144,9 +5145,8 @@ regulator_register(const struct regulator_desc *regulator_desc,
> */
> config = kmemdup(cfg, sizeof(*cfg), GFP_KERNEL);
> if (config == NULL) {
> - kfree(rdev);
> ret = -ENOMEM;
> - goto rinse;
> + goto clean;
Here config == NULL
> }
>
> init_data = regulator_of_get_init_data(dev, regulator_desc, config,
> @@ -5158,10 +5158,8 @@ regulator_register(const struct regulator_desc *regulator_desc,
> * from a gpio extender or something else.
> */
> if (PTR_ERR(init_data) == -EPROBE_DEFER) {
> - kfree(config);
> - kfree(rdev);
> ret = -EPROBE_DEFER;
> - goto rinse;
> + goto clean;
> }
>
> /*
> @@ -5214,7 +5212,6 @@ regulator_register(const struct regulator_desc *regulator_desc,
> }
>
> /* register with sysfs */
> - device_initialize(&rdev->dev);
> rdev->dev.class = ®ulator_class;
> rdev->dev.parent = dev;
> dev_set_name(&rdev->dev, "regulator.%lu",
> @@ -5292,13 +5289,11 @@ regulator_register(const struct regulator_desc *regulator_desc,
> mutex_lock(®ulator_list_mutex);
> regulator_ena_gpio_free(rdev);
> mutex_unlock(®ulator_list_mutex);
> - put_device(&rdev->dev);
> - rdev = NULL;
> clean:
> if (dangling_of_gpiod)
> gpiod_put(config->ena_gpiod);
And above 'config' NULL pointer could be dereferenced now, right?
> - kfree(rdev);
> kfree(config);
> + put_device(&rdev->dev);
> rinse:
> if (dangling_cfg_gpiod)
> gpiod_put(cfg->ena_gpiod);
>
--
Best wishes,
Vladimir
next prev parent reply other threads:[~2020-08-12 6:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 1:31 [PATCH v2 0/7] regulator: fix deadlock vs memory reclaim Michał Mirosław
2020-08-12 1:31 ` [PATCH v2 1/7] regulator: push allocation in regulator_init_coupling() outside of lock Michał Mirosław
2020-08-12 1:31 ` [PATCH v2 2/7] regulator: push allocation in regulator_ena_gpio_request() out " Michał Mirosław
2020-08-18 0:25 ` Dmitry Osipenko
2020-08-12 1:31 ` [PATCH v2 3/7] regulator: push allocations in create_regulator() outside " Michał Mirosław
2020-08-12 1:31 ` [PATCH v2 5/7] regulator: plug of_node leak in regulator_register()'s error path Michał Mirosław
2020-08-12 6:29 ` Vladimir Zapolskiy [this message]
2020-08-12 14:09 ` Michał Mirosław
2020-08-13 8:29 ` Vladimir Zapolskiy
2020-08-12 1:31 ` [PATCH v2 4/7] regulator: push allocation in set_consumer_device_supply() out of lock Michał Mirosław
2020-08-12 1:31 ` [PATCH v2 6/7] regulator: cleanup regulator_ena_gpio_free() Michał Mirosław
2020-08-12 1:31 ` [PATCH v2 7/7] regulator: remove superfluous lock in regulator_resolve_coupling() Michał Mirosław
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=cddd3d73-8666-d64b-34f5-d82a3b31cf36@mleia.com \
--to=vz@mleia.com \
--cc=broonie@kernel.org \
--cc=digetx@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
/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;
as well as URLs for NNTP newsgroup(s).