Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756148AbYJXLpO (ORCPT ); Fri, 24 Oct 2008 07:45:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753647AbYJXLo7 (ORCPT ); Fri, 24 Oct 2008 07:44:59 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:43996 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752179AbYJXLo6 (ORCPT ); Fri, 24 Oct 2008 07:44:58 -0400 From: "Rafael J. Wysocki" To: James Bottomley , Jesse Barnes Subject: [PATCH] Subject: Prevent acpi_run_osc from using NULL objects (was: Re: Oops in ACPI with git latest) Date: Fri, 24 Oct 2008 13:49:42 +0200 User-Agent: KMail/1.9.9 Cc: "Moore, Robert" , "linux-acpi@vger.kernel.org" , "linux-kernel" , Len Brown References: <1224791103.3330.37.camel@localhost.localdomain> <1224811642.3330.57.camel@localhost.localdomain> <200810240857.18190.rjw@sisk.pl> In-Reply-To: <200810240857.18190.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200810241349.43166.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2000 Lines: 63 On Friday, 24 of October 2008, Rafael J. Wysocki wrote: > On Friday, 24 of October 2008, James Bottomley wrote: > > On Thu, 2008-10-23 at 15:34 -0700, Moore, Robert wrote: > > > + if (!output.pointer) > > > + return AE_NULL_OBJECT; > > > + > > > > > > This probably won't work. acpi_evaluate_object currently doesn't touch the pointer parameter if there is no return value, it only sets the length to zero. > > > > Actually, it does. > > Well, this was the only candidate for a NULL pointer dereference, so I'd be > surprised if it didn't. :-) > > > > So, you might try this: > > > > > > + if (!output.length) > > > + return AE_NULL_OBJECT; > > > + > > Still, I'd expect the AML interpreter to return error code in this case. > > > This also works. > > Why don't we make it extra safe, then. ;-) > > --- > From: Rafael J. Wysocki > Subject: Prevent acpi_osc_run from using NULL objects Ah, mistake in the subject. --- From: Rafael J. Wysocki Subject: Prevent acpi_run_osc from using NULL objects Check if the object returned by acpi_evaluate_object() in acpi_run_osc() is not NULL before using it. Signed-off-by: Rafael J. Wysocki --- drivers/pci/pci-acpi.c | 3 +++ 1 file changed, 3 insertions(+) Index: linux-2.6/drivers/pci/pci-acpi.c =================================================================== --- linux-2.6.orig/drivers/pci/pci-acpi.c +++ linux-2.6/drivers/pci/pci-acpi.c @@ -83,6 +83,9 @@ static acpi_status acpi_run_osc(acpi_han if (ACPI_FAILURE(status)) return status; + if (!output.pointer || !output.length) + return AE_NULL_OBJECT; + out_obj = output.pointer; if (out_obj->type != ACPI_TYPE_BUFFER) { printk(KERN_DEBUG "Evaluate _OSC returns wrong type\n"); -- 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/