From: "Mark Pearson" <mpearson-lenovo@squebb.ca>
To: "Mirsad Goran Todorovac" <mirsad.todorovac@alu.unizg.hr>,
"Hans de Goede" <hdegoede@redhat.com>,
"Thomas Weißschuh" <thomas@t-8ch.de>
Cc: "Armin Wolf" <W_Armin@gmx.de>,
"Greg KH" <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
linux-kernel@vger.kernel.org,
"markgross@kernel.org" <markgross@kernel.org>,
"platform-driver-x86@vger.kernel.org"
<platform-driver-x86@vger.kernel.org>
Subject: Re: [BUG] [RFC] systemd-devd triggers kernel memleak apparently in drivers/core/dd.c: driver_register()
Date: Wed, 29 Mar 2023 14:59:54 -0400 [thread overview]
Message-ID: <b06d1d1f-7cd5-4532-ac49-d449ef68bbcb@app.fastmail.com> (raw)
In-Reply-To: <4dc118c2-0dde-bd5e-ea41-427ed33e4545@alu.unizg.hr>
Thanks Mirsad
On Wed, Mar 29, 2023, at 2:49 PM, Mirsad Goran Todorovac wrote:
<snip>
>
> Here is the patch proposal according to what Mark advised (using
> different name for optitem):
>
> diff --git a/drivers/platform/x86/think-lmi.c
> b/drivers/platform/x86/think-lmi.c
> index c816646eb661..ab17254781c4 100644
> --- a/drivers/platform/x86/think-lmi.c
> +++ b/drivers/platform/x86/think-lmi.c
> @@ -929,8 +929,10 @@ static ssize_t current_value_show(struct kobject
> *kobj, struct kobj_attribute *a
>
> /* validate and split from `item,value` -> `value` */
> value = strpbrk(item, ",");
> - if (!value || value == item || !strlen(value + 1))
> + if (!value || value == item || !strlen(value + 1)) {
> + kfree(item);
> return -EINVAL;
> + }
>
> ret = sysfs_emit(buf, "%s\n", value + 1);
> kfree(item);
> @@ -1380,7 +1382,6 @@ static struct tlmi_pwd_setting
> *tlmi_create_auth(const char *pwd_type,
>
> static int tlmi_analyze(void)
> {
> - acpi_status status;
> int i, ret;
>
> if (wmi_has_guid(LENOVO_SET_BIOS_SETTINGS_GUID) &&
> @@ -1417,8 +1418,8 @@ static int tlmi_analyze(void)
> char *p;
>
> tlmi_priv.setting[i] = NULL;
> - status = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
> - if (ACPI_FAILURE(status))
> + ret = tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID);
> + if (ret)
Really minor, but tweak to be this and save a line of code?
+ if (tlmi_setting(i, &item, LENOVO_BIOS_SETTING_GUID))
> break;
> if (!item)
> break;
> @@ -1457,10 +1458,10 @@ static int tlmi_analyze(void)
> * name string.
> * Try and pull that out if it's available.
> */
> - char *item, *optstart, *optend;
> + char *optitem, *optstart, *optend;
>
> - if (!tlmi_setting(setting->index, &item,
> LENOVO_BIOS_SETTING_GUID)) {
> - optstart = strstr(item, "[Optional:");
> + if (!tlmi_setting(setting->index, &optitem,
> LENOVO_BIOS_SETTING_GUID)) {
> + optstart = strstr(optitem,
> "[Optional:");
> if (optstart) {
> optstart +=
> strlen("[Optional:");
> optend = strstr(optstart, "]");
> @@ -1469,6 +1470,7 @@ static int tlmi_analyze(void)
>
> kstrndup(optstart, optend - optstart,
>
> GFP_KERNEL);
> }
> + kfree(optitem);
> }
> }
> /*
>
> I have tested it, but without a few blunders of my own.
I'm running a build locally and will aim to put this thru a few different platforms myself too and sanity check
> I guess "nobody wins them all".
I hear you :P
Mark
next prev parent reply other threads:[~2023-03-29 19:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5059b11b-8b6e-394b-338f-49e1339067fa@alu.unizg.hr>
[not found] ` <ZCLPaYGKHlFQGKYQ@kroah.com>
2023-03-28 11:59 ` [BUG] systemd-devd triggers kernel memleak apparently in drivers/core/dd.c: driver_register() Mirsad Todorovac
2023-03-28 12:08 ` Mirsad Todorovac
2023-03-28 12:17 ` Greg Kroah-Hartman
2023-03-28 12:44 ` Mirsad Todorovac
2023-03-28 16:53 ` Armin Wolf
2023-03-28 19:06 ` Mirsad Goran Todorovac
2023-03-28 19:55 ` Armin Wolf
2023-03-29 8:13 ` Mirsad Goran Todorovac
2023-03-29 13:22 ` [BUG] [BISECTED] " Mirsad Goran Todorovac
2023-03-29 13:31 ` [BUG] [BISECTED] [CORRECTION] " Mirsad Goran Todorovac
2023-03-29 13:35 ` Thomas Weißschuh
2023-03-29 14:18 ` Mirsad Goran Todorovac
2023-03-29 15:46 ` Hans de Goede
2023-03-29 16:24 ` Mark Pearson
2023-03-29 16:43 ` Mirsad Goran Todorovac
2023-03-29 18:49 ` [BUG] [RFC] " Mirsad Goran Todorovac
2023-03-29 18:59 ` Mark Pearson [this message]
2023-03-29 19:21 ` Thomas Weißschuh
2023-03-29 21:50 ` Mirsad Goran Todorovac
2023-03-31 18:54 ` Mark Pearson
2023-03-31 19:04 ` Hans de Goede
2023-03-31 19:10 ` Mark Pearson
2023-03-31 19:13 ` Mirsad Goran Todorovac
2023-03-29 16:27 ` [BUG] [BISECTED] [CORRECTION] " Mirsad Goran Todorovac
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=b06d1d1f-7cd5-4532-ac49-d449ef68bbcb@app.fastmail.com \
--to=mpearson-lenovo@squebb.ca \
--cc=W_Armin@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=mirsad.todorovac@alu.unizg.hr \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=thomas@t-8ch.de \
/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).