Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753203AbZI0B7f (ORCPT ); Sat, 26 Sep 2009 21:59:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753160AbZI0B7d (ORCPT ); Sat, 26 Sep 2009 21:59:33 -0400 Received: from mga02.intel.com ([134.134.136.20]:49993 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753142AbZI0B7c (ORCPT ); Sat, 26 Sep 2009 21:59:32 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,459,1249282800"; d="scan'208";a="554078797" Subject: Re: [PATCH] acpi: fix null pointer deference of hardware_id string From: Lin Ming To: Thomas Meyer Cc: "linux-kernel@vger.kernel.org" , Len Brown , linux-acpi In-Reply-To: <1253903053.26639.3.camel@localhost> References: <1250133125.4044.19.camel@minggr.sh.intel.com> <1253903053.26639.3.camel@localhost> Content-Type: text/plain Date: Sun, 27 Sep 2009 09:49:58 +0800 Message-Id: <1254016198.17697.19.camel@minggr.sh.intel.com> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 (2.24.1-2.fc10) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2687 Lines: 71 On Sat, 2009-09-26 at 02:24 +0800, Thomas Meyer wrote: > Am Donnerstag, den 13.08.2009, 11:12 +0800 schrieb Lin Ming: > > From: Lin Ming > > Date: Thu, 13 Aug 2009 11:04:47 +0800 > > Another month, another git repository... > > Are there any reasons why the patch below didn't land in linus' git > tree? A similar patch from Bjorn Helgaas is in Linus' tree. ACPICA: fixup after acpi_get_object_info() change b24715027aab5e586c4ab1d035f3e543307dea69 Lin Ming > > > Subject: [PATCH] acpi: fix null pointer deference of hardware_id string > > > > This regression was caused by commit ed44482 > > "ACPICA: Major update for acpi_get_object_info external interface" > > > > Don't need to set hardware_id string \0 terminated here, > > acpi_get_object_info already handles it. > > > > Tested-by: Thomas Meyer > > Signed-off-by: Lin Ming > > --- > > drivers/char/agp/hp-agp.c | 6 ++++-- > > drivers/pci/hotplug/acpiphp_ibm.c | 1 - > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c > > index 7bead4c..d83c4a8 100644 > > --- a/drivers/char/agp/hp-agp.c > > +++ b/drivers/char/agp/hp-agp.c > > @@ -492,8 +492,10 @@ zx1_gart_probe (acpi_handle obj, u32 depth, void *context, void **ret) > > status = acpi_get_object_info(handle, &info); > > if (ACPI_SUCCESS(status)) { > > /* TBD check _CID also */ > > - info->hardware_id.string[sizeof(info->hardware_id.length)-1] = '\0'; > > - match = (strcmp(info->hardware_id.string, "HWP0001") == 0); > > + if (info->valid & ACPI_VALID_HID) > > + match = !strcmp(info->hardware_id.string, "HWP0001"); > > + else > > + match = 0; > > kfree(info); > > if (match) { > > status = hp_acpi_csr_space(handle, &sba_hpa, &length); > > diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c > > index a9d926b..e7be66d 100644 > > --- a/drivers/pci/hotplug/acpiphp_ibm.c > > +++ b/drivers/pci/hotplug/acpiphp_ibm.c > > @@ -406,7 +406,6 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle, > > __func__, status); > > return retval; > > } > > - info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0'; > > > > if (info->current_status && (info->valid & ACPI_VALID_HID) && > > (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) || > > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/