Re: Oops in ACPI with git latest

[Len Brown <lenb@kernel.org>]

applied.

thanks,
-len

On Fri, 24 Oct 2008, Rafael J. Wysocki wrote:

> On Friday, 24 of October 2008, Jesse Barnes wrote:
> > On Friday, October 24, 2008 11:43 am Rafael J. Wysocki wrote:
> > > On Friday, 24 of October 2008, Jesse Barnes wrote:
> > > > So who wants to send me a final patch for this?
> > >
> > > I already did: http://marc.info/?l=linux-kernel&m=122484871717023&w=4
> > > but I can remove the "!output.pointer || " if you prefer. :-)
> > 
> > Yeah Bob said it would likely contain garbage anyway, so we should just remove 
> > it.
> 
> OK, here you go.
> 
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
> 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 <rjw@sisk.pl>
> ---
>  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.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");
>