| Message ID | 20220124131346.12571-1-linmq006@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6a4760463dbc6b603690938c468839985189ce0a |
| Headers | show |
| Series | power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init | expand |
[+cc Linus Walleij] Hi, On Mon, Jan 24, 2022 at 01:13:46PM +0000, Miaoqian Lin wrote: > kobject_init_and_add() takes reference even when it fails. > According to the doc of kobject_init_and_add()： > > If this function returns an error, kobject_put() must be called to > properly clean up the memory associated with the object. > > Fix memory leak by calling kobject_put(). > > Fixes: 8c0984e5a753 ("power: move power supply drivers to power/supply") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- Thanks, queued power-supply's for-next branch. Linus, if I'm not mistaken the custom sysfs ABI (i.e. everything related to ab8500_fg_sysfs_init() can just be removed since the same thing is already exposed standardized via POWER_SUPPLY_PROP_CHARGE_FULL and POWER_SUPPLY_PROP_CHARGE_NOW? -- Sebastian > drivers/power/supply/ab8500_fg.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c > index 05fe9724ba50..57799a8079d4 100644 > --- a/drivers/power/supply/ab8500_fg.c > +++ b/drivers/power/supply/ab8500_fg.c > @@ -2545,8 +2545,10 @@ static int ab8500_fg_sysfs_init(struct ab8500_fg *di) > ret = kobject_init_and_add(&di->fg_kobject, > &ab8500_fg_ktype, > NULL, "battery"); > - if (ret < 0) > + if (ret < 0) { > + kobject_put(&di->fg_kobject); > dev_err(di->dev, "failed to create sysfs entry\n"); > + } > > return ret; > } > -- > 2.17.1 >
On Fri, Feb 11, 2022 at 9:04 PM Sebastian Reichel <sebastian.reichel@collabora.com> wrote: > > Fixes: 8c0984e5a753 ("power: move power supply drivers to power/supply") > > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > > --- > > Thanks, queued power-supply's for-next branch. > > Linus, if I'm not mistaken the custom sysfs ABI (i.e. everything related > to ab8500_fg_sysfs_init() can just be removed since the same thing is > already exposed standardized via POWER_SUPPLY_PROP_CHARGE_FULL and > POWER_SUPPLY_PROP_CHARGE_NOW? Yes, I delete other weird custom sysfs, so I'll cook a patch to get rid of this too. Yours, Linus Walleij
diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c index 05fe9724ba50..57799a8079d4 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -2545,8 +2545,10 @@ static int ab8500_fg_sysfs_init(struct ab8500_fg *di) ret = kobject_init_and_add(&di->fg_kobject, &ab8500_fg_ktype, NULL, "battery"); - if (ret < 0) + if (ret < 0) { + kobject_put(&di->fg_kobject); dev_err(di->dev, "failed to create sysfs entry\n"); + } return ret; }
kobject_init_and_add() takes reference even when it fails. According to the doc of kobject_init_and_add()： If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Fix memory leak by calling kobject_put(). Fixes: 8c0984e5a753 ("power: move power supply drivers to power/supply") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- drivers/power/supply/ab8500_fg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)