From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: ahs3@redhat.com, David Arcari <darcari@redhat.com>
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
Jassi Brar <jassisinghbrar@gmail.com>
Subject: Re: [PATCH] mailbox: PCC: handle parse error
Date: Fri, 14 Sep 2018 10:41:06 +0200 [thread overview]
Message-ID: <8358588.tR87Gxe1PI@aspire.rjw.lan> (raw)
In-Reply-To: <e9d05632-dae6-b904-fe62-d617b3dfe3fd@redhat.com>
On Monday, August 27, 2018 10:55:41 PM CEST Al Stone wrote:
> On 08/27/2018 01:19 PM, David Arcari wrote:
> > acpi_pcc_probe calls acpi_table_parse_entries_array but fails to check
> > for an error return. This in turn can result in calling kcalloc with
> > a negative count as well as emitting the following misleading erorr
> > message:
> >
> > [ 2.642015] Could not allocate space for PCC mbox channels
> >
> > Fixes: 8f8027c5f935 ("mailbox: PCC: erroneous error message when parsing ACPI PCCT")
> >
> > Signed-off-by: David Arcari <darcari@redhat.com>
> > Cc: Al Stone <ahs3@redhat.com>
> > Cc: Jassi Brar <jassisinghbrar@gmail.com>
> > ---
> > drivers/mailbox/pcc.c | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
> > index 311e91b..256f18b 100644
> > --- a/drivers/mailbox/pcc.c
> > +++ b/drivers/mailbox/pcc.c
> > @@ -461,8 +461,11 @@ static int __init acpi_pcc_probe(void)
> > count = acpi_table_parse_entries_array(ACPI_SIG_PCCT,
> > sizeof(struct acpi_table_pcct), proc,
> > ACPI_PCCT_TYPE_RESERVED, MAX_PCC_SUBSPACES);
> > - if (count == 0 || count > MAX_PCC_SUBSPACES) {
> > - pr_warn("Invalid PCCT: %d PCC subspaces\n", count);
> > + if (count <= 0 || count > MAX_PCC_SUBSPACES) {
> > + if (count < 0)
> > + pr_warn("Error parsing PCC subspaces from PCCT\n");
> > + else
> > + pr_warn("Invalid PCCT: %d PCC subspaces\n", count);
> > return -EINVAL;
> > }
> >
> >
>
> Thanks, David. Nice catch.
>
> Reviewed-by: Al Stone <ahs3@redhat.com>
Patch applied, thanks!
prev parent reply other threads:[~2018-09-14 8:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 19:19 [PATCH] mailbox: PCC: handle parse error David Arcari
2018-08-27 20:55 ` Al Stone
2018-09-14 8:41 ` Rafael J. Wysocki [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=8358588.tR87Gxe1PI@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=ahs3@redhat.com \
--cc=darcari@redhat.com \
--cc=jassisinghbrar@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).