From: Al Stone <ahs3@redhat.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>
Subject: Re: [PATCH v2 2/3] ACPI: ensure acpi_parse_entries_array() does not access non-existent table data
Date: Mon, 30 Apr 2018 17:28:18 -0600 [thread overview]
Message-ID: <e644ffce-cbbc-dcf3-33a9-a06fe2477a18@redhat.com> (raw)
In-Reply-To: <CAJZ5v0h77XTGeJ3oDzxjW2_Otm5bZtu51fudCJ277yd_CXWTuQ@mail.gmail.com>
On 04/27/2018 05:05 AM, Rafael J. Wysocki wrote:
> On Tue, Apr 24, 2018 at 9:35 PM, Al Stone <ahs3@redhat.com> wrote:
>> For ACPI tables that have subtables, acpi_parse_entries_array() gets used
>> to step through each of the subtables in memory. The primary loop for this
>> was checking that the beginning location of the subtable being examined
>> plus the length of struct acpi_subtable_header was not beyond the end of
>> the complete ACPI table; if it wasn't, the subtable could be examined, but
>> if it was the loop would terminate as it should.
>>
>> In the middle of this subtable loop, a callback is used to examine the
>> subtable in detail.
>>
>> Should the callback function try to examine elements of the subtable that
>> are located past the subtable header, and the ACPI table containing this
>> subtable has an incorrect length, it is possible to access either invalid
>> or protected memory and cause a fault. And, the length of struct
>> acpi_subtable_header will always be smaller than the length of the actual
>> subtable.
>>
>> To fix this, we make the main loop check that the beginning of the
>> subtable being examined plus the actual length of the subtable does
>> not go past the end of the enclosing ACPI table. While this cannot
>> protect us from malicious callback functions, it can prevent us from
>> failing because of some poorly constructed ACPI tables.
>>
>> Found by inspection. There is no functional change to existing code
>> that is known to work when calling acpi_parse_entries_array().
>>
>> Signed-off-by: Al Stone <ahs3@redhat.com>
>> Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
>> Cc: Len Brown <lenb@kernel.org>
>> ---
>> drivers/acpi/tables.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
>> index 21535762b890..c7b028f231a6 100644
>> --- a/drivers/acpi/tables.c
>> +++ b/drivers/acpi/tables.c
>> @@ -271,8 +271,7 @@ acpi_parse_entries_array(char *id, unsigned long table_size,
>> entry = (struct acpi_subtable_header *)
>> ((unsigned long)table_header + table_size);
>>
>> - while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) <
>> - table_end) {
>> + while (((unsigned long)entry + entry->length) <= table_end) {
>
> The inner parens are not needed.
Pure paranoia on my part. Will fix.
>> if (max_entries && count >= max_entries)
>> break;
>>
>> --
--
ciao,
al
-----------------------------------
Al Stone
Software Engineer
Red Hat, Inc.
ahs3@redhat.com
-----------------------------------
next prev parent reply other threads:[~2018-04-30 23:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 19:35 [PATCH v2 0/3] mailbox: ACPI: Remove incorrect error message about parsing PCCT Al Stone
2018-04-24 19:35 ` [PATCH v2 1/3] ACPI: improve function documentation for acpi_parse_entries_array() Al Stone
2018-04-27 11:04 ` Rafael J. Wysocki
2018-04-30 23:27 ` Al Stone
2018-04-24 19:35 ` [PATCH v2 2/3] ACPI: ensure acpi_parse_entries_array() does not access non-existent table data Al Stone
2018-04-27 11:05 ` Rafael J. Wysocki
2018-04-30 23:28 ` Al Stone [this message]
2018-04-24 19:35 ` [PATCH v2 3/3] mailbox: ACPI: erroneous error message when parsing the ACPI PCCT Al Stone
2018-04-27 11:16 ` Rafael J. Wysocki
2018-04-30 23:39 ` Al Stone
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=e644ffce-cbbc-dcf3-33a9-a06fe2477a18@redhat.com \
--to=ahs3@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rjw@rjwysocki.net \
/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).