From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: Re: [PATCH 4/4] ACPI: Make sure the FADT is at least rev 2 before using the reset register Date: Wed, 23 Mar 2011 00:01:50 -0400 (EDT) Message-ID: References: <1299877940-6870-1-git-send-email-mjg@redhat.com> <1299877940-6870-4-git-send-email-mjg@redhat.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from vms173017pub.verizon.net ([206.46.173.17]:53242 "EHLO vms173017pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751109Ab1CWEB6 (ORCPT ); Wed, 23 Mar 2011 00:01:58 -0400 In-reply-to: <1299877940-6870-4-git-send-email-mjg@redhat.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Matthew Garrett Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org On Fri, 11 Mar 2011, Matthew Garrett wrote: > The reset register was only introduced with version 2 of the FADT, so we > should check that the FADT revision before trusting its contents. > > Signed-off-by: Matthew Garrett > --- > drivers/acpi/reboot.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c > index 4870aaa..a6c77e8b 100644 > --- a/drivers/acpi/reboot.c > +++ b/drivers/acpi/reboot.c > @@ -15,6 +15,11 @@ void acpi_reboot(void) > > rr = &acpi_gbl_FADT.reset_register; > > + /* ACPI reset register was only introduced with v2 of the FADT */ > + > + if (acpi_gbl_FADT.header.revision < 2) > + return; > + Isn't this check redundant with the check just below this hunk? > /* Is the reset register supported? The spec says we should be > * checking the bit width and bit offset, but Windows ignores > * these fields */ if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER)) return; For it not to be redundant, there would have to be FADTs out there of revision 1 that set what was then a reserved bit in the flags. thanks, Len Brown, Intel Open Source Technology Center