From: Hans de Goede <hdegoede@redhat.com>
To: Arnd Bergmann <arnd@kernel.org>, Matan Ziv-Av <matan@svgalib.org>,
Mark Gross <mgross@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] platform/x86: lg-laptop: Fix possible NULL pointer derefence
Date: Tue, 21 Sep 2021 12:12:01 +0200 [thread overview]
Message-ID: <76bfc870-b229-c8b9-4458-62e239b7663b@redhat.com> (raw)
In-Reply-To: <20210920095556.1175269-1-arnd@kernel.org>
Hi Arnd,
On 9/20/21 11:55 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When CONFIG_DMI is disabled, dmi_get_system_info() returns a NULL
> pointer, which is now caught by a warning:
>
> In function 'strlen',
> inlined from 'acpi_add.part.0' at drivers/platform/x86/lg-laptop.c:658:6:
> include/linux/fortify-string.h:25:33: error: argument 1 null where non-null expected [-Werror=nonnull]
> 25 | #define __underlying_strlen __builtin_strlen
> | ^
> include/linux/fortify-string.h:60:24: note: in expansion of macro '__underlying_strlen'
> 60 | return __underlying_strlen(p);
> | ^~~~~~~~~~~~~~~~~~~
> drivers/platform/x86/lg-laptop.c: In function 'acpi_add.part.0':
> include/linux/fortify-string.h:25:33: note: in a call to built-in function '__builtin_strlen'
> 25 | #define __underlying_strlen __builtin_strlen
> | ^
> include/linux/fortify-string.h:60:24: note: in expansion of macro '__underlying_strlen'
> 60 | return __underlying_strlen(p);
> | ^~~~~~~~~~~~~~~~~~~
>
> The code in there does not appear essential, so an explicit
> NULL check should be sufficient. The string is also printed
> to the console, but printk() is able to handle NULL pointer
> arguments gracefully.
>
> Fixes: 8983bfd58d61 ("platform/x86: lg-laptop: Support for battery charge limit on newer models")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thank you for the patch, but this is already fixed in the pdx86 fixes branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=fixes&id=4c4a3d7cffb42da21ea8891fc7e6808ae05dbcb5
Regards,
Hans
> ---
> drivers/platform/x86/lg-laptop.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c
> index 3e520d5bca07..88b551caeaaf 100644
> --- a/drivers/platform/x86/lg-laptop.c
> +++ b/drivers/platform/x86/lg-laptop.c
> @@ -655,7 +655,7 @@ static int acpi_add(struct acpi_device *device)
> goto out_platform_registered;
> }
> product = dmi_get_system_info(DMI_PRODUCT_NAME);
> - if (strlen(product) > 4)
> + if (product && strlen(product) > 4)
> switch (product[4]) {
> case '5':
> case '6':
>
prev parent reply other threads:[~2021-09-21 10:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 9:55 [PATCH] platform/x86: lg-laptop: Fix possible NULL pointer derefence Arnd Bergmann
2021-09-20 17:45 ` Mark Gross
2021-09-21 10:12 ` Hans de Goede [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=76bfc870-b229-c8b9-4458-62e239b7663b@redhat.com \
--to=hdegoede@redhat.com \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matan@svgalib.org \
--cc=mgross@linux.intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael.j.wysocki@intel.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;
as well as URLs for NNTP newsgroup(s).