From: Lee Jones <lee@kernel.org>
To: Myeonghun Pak <mhun512@gmail.com>
Cc: Jan-Simon Moeller <jansimon.moeller@gmx.de>,
Pavel Machek <pavel@kernel.org>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH] leds: blinkm: Remove sysfs group on allocation failure
Date: Tue, 22 Sep 2026 13:40:51 +0100 [thread overview]
Message-ID: <20260922124051.GG3277918@google.com> (raw)
In-Reply-To: <20260922123745.GF3277918@google.com>
On Tue, 22 Sep 2026, Lee Jones wrote:
> On Tue, 22 Sep 2026, Lee Jones wrote:
>
> > On Mon, 14 Sep 2026, Myeonghun Pak wrote:
> >
> > > register_multicolor() returns on allocation failure without removing the
> > > sysfs group created by blinkm_probe(). Remove it on this path, matching
> > > the helper's existing LED registration error cleanup.
> > >
> > > This issue was identified during our ongoing static-analysis research
> > > while reviewing kernel code.
> > >
> > > Fixes: 56e8c56c9af0 ("leds: Add multicolor support to BlinkM LED driver")
> > > Cc: stable@vger.kernel.org
> > > Assisted-by: LLM
> > > Co-developed-by: Ijae Kim <ae878000@gmail.com>
> > > Signed-off-by: Ijae Kim <ae878000@gmail.com>
> > > Signed-off-by: Myeonghun Pak <mhun512@gmail.com>
> > > ---
> > > drivers/leds/leds-blinkm.c | 4 +++-
> > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
> > > --- a/drivers/leds/leds-blinkm.c
> > > +++ b/drivers/leds/leds-blinkm.c
> > > @@ -691,8 +691,10 @@ static int register_multicolor(struct i2c_client *client, struct blinkm_data *da
> > >
> > > mc_led_info = devm_kcalloc(&client->dev, NUM_LEDS, sizeof(*mc_led_info),
> > > GFP_KERNEL);
> > > - if (!mc_led_info)
> > > + if (!mc_led_info) {
> > > + sysfs_remove_group(&client->dev.kobj, &blinkm_group);
> >
> > If 'blinkm_group' was created in blinkm_probe(), shouldn't it be cleaned up in
> > the error path of 'blinkm_probe()' rather than here in the callee?
>
> Same with register_separate_colors() failure, no?
What about:
diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c
index ee1589015826..7932095780aa 100644
--- a/drivers/leds/leds-blinkm.c
+++ b/drivers/leds/leds-blinkm.c
@@ -749,19 +749,17 @@ static int blinkm_probe(struct i2c_client *client)
return err;
}
- if (!IS_ENABLED(CONFIG_LEDS_BLINKM_MULTICOLOR)) {
+ if (!IS_ENABLED(CONFIG_LEDS_BLINKM_MULTICOLOR))
err = register_separate_colors(client, data);
- if (err < 0)
- return err;
- } else {
+ else
err = register_multicolor(client, data);
- if (err < 0)
- return err;
- }
- blinkm_init_hw(client);
+ if (err < 0)
+ sysfs_remove_group(&client->dev.kobj, &blinkm_group);
+ else
+ blinkm_init_hw(client);
- return 0;
+ return err;
}
This is completely untested.
--
Lee Jones
prev parent reply other threads:[~2026-09-22 12:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-15 2:06 Myeonghun Pak
2026-09-22 12:37 ` Lee Jones
2026-09-22 12:37 ` Lee Jones
2026-09-22 12:40 ` Lee Jones [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=20260922124051.GG3277918@google.com \
--to=lee@kernel.org \
--cc=jansimon.moeller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=mhun512@gmail.com \
--cc=pavel@kernel.org \
--cc=stable@vger.kernel.org \
/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®