From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: Andy Shevchenko <andy@kernel.org>,
James Harmison <jharmison@redhat.com>,
platform-driver-x86@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 1/3] platform/x86: panasonic-laptop: Check minimum SQTY value
Date: Tue, 3 Sep 2024 13:29:59 +0300 (EEST) [thread overview]
Message-ID: <dc2b719f-ba72-2d14-83d6-7ff35053d945@linux.intel.com> (raw)
In-Reply-To: <20240903083533.9403-1-hdegoede@redhat.com>
On Tue, 3 Sep 2024, Hans de Goede wrote:
> The panasonic laptop code in various places uses the sinf array with index
> values of 0 - SINF_CUR_BRIGHT(0x0d) without checking that the sinf array
> is big enough.
>
> Check for a minimum SQTY value of SINF_CUR_BRIGHT to avoid out of bounds
> accesses of the sinf array.
This description is a bit misleading. The patch is _not_ adding a bounds
check to sinf array access paths but ensuring the allocation is big
enough for those accesses. It took me a while to figure out so I suggest
the wording is improved to clearly explain how the problem has been
addressed.
--
i.
> Note SQTY returning SINF_CUR_BRIGHT is ok because the driver adds one extra
> entry to the sinf array.
>
> Fixes: e424fb8cc4e6 ("panasonic-laptop: avoid overflow in acpi_pcc_hotkey_add()")
> Cc: stable@vger.kernel.org
> Tested-by: James Harmison <jharmison@redhat.com>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/platform/x86/panasonic-laptop.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
> index cf845ee1c7b1..d7f9017a5a13 100644
> --- a/drivers/platform/x86/panasonic-laptop.c
> +++ b/drivers/platform/x86/panasonic-laptop.c
> @@ -963,8 +963,8 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
>
> num_sifr = acpi_pcc_get_sqty(device);
>
> - if (num_sifr < 0 || num_sifr > 255) {
> - pr_err("num_sifr out of range");
> + if (num_sifr < SINF_CUR_BRIGHT || num_sifr > 255) {
> + pr_err("num_sifr %d out of range %d - 255\n", num_sifr, SINF_CUR_BRIGHT);
> return -ENODEV;
> }
>
>
prev parent reply other threads:[~2024-09-03 10:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-03 8:35 [PATCH 1/3] platform/x86: panasonic-laptop: Check minimum SQTY value Hans de Goede
2024-09-03 8:35 ` [PATCH 2/3] platform/x86: panasonic-laptop: Allocate 1 entry extra in the sinf array Hans de Goede
2024-09-03 10:33 ` Ilpo Järvinen
2024-09-03 11:07 ` Andy Shevchenko
2024-09-03 8:35 ` [PATCH 3/3] platform/x86: panasonic-laptop: Add support for programmable buttons Hans de Goede
2024-09-03 10:35 ` Ilpo Järvinen
2024-09-03 11:09 ` Andy Shevchenko
2024-09-03 10:29 ` Ilpo Järvinen [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=dc2b719f-ba72-2d14-83d6-7ff35053d945@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=andy@kernel.org \
--cc=hdegoede@redhat.com \
--cc=jharmison@redhat.com \
--cc=platform-driver-x86@vger.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