From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Borzenkov Subject: Re: [PATCH] Fix Oops in toshiba_acpi error return path Date: Sun, 4 Nov 2007 19:15:23 +0300 Message-ID: <200711041915.28883.arvidjaar@mail.ru> References: <200710072053.02865.arvidjaar@mail.ru> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2196261.t2e0JdY9dG"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Return-path: Received: from mx5.mail.ru ([194.67.23.25]:9075 "EHLO mx5.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292AbXKDQPd (ORCPT ); Sun, 4 Nov 2007 11:15:33 -0500 In-Reply-To: <200710072053.02865.arvidjaar@mail.ru> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: toshiba_acpi@memebeam.org Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org --nextPart2196261.t2e0JdY9dG Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sunday 07 October 2007, Andrey Borzenkov wrote: > This fixes oops when registering backlight device fails. Attached as I > still cannot convince kmail to not mangle long lines ... > > -andrey ping ...=20 Subject: [PATCH] Fix Oops in toshiba_acpi error return path When backlight_device_register() fails, return after undo initialization, do not try to use pointer that just was reset to NULL This fixes this oops: [ 1595.177672] [] show_trace_log_lvl+0x1a/0x30 [ 1595.177706] [] show_trace+0x12/0x20 [ 1595.177718] [] dump_stack+0x15/0x20 [ 1595.177728] [] kobject_shadow_add+0x125/0x1c0 [ 1595.177754] [] kobject_add+0xa/0x10 [ 1595.177764] [] device_add+0x97/0x5d0 [ 1595.177776] [] device_register+0x12/0x20 [ 1595.177786] [] backlight_device_register+0x9f/0x110 [backligh= t] [ 1595.177814] [] toshiba_acpi_init+0x117/0x15e [toshiba_acpi] [ 1595.177834] [] sys_init_module+0xfd/0x14e0 [ 1595.177871] [] sysenter_past_esp+0x5f/0x99 [ 1595.177883] =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D [ 1595.177890] Could not register toshiba backlight device [ 1595.177985] BUG: unable to handle kernel NULL pointer dereference at=20 virtual address 00000004 =2E.. [ 1595.394097] EIP: 0060:[] Not tainted VLI [ 1595.394101] EFLAGS: 00010282 (2.6.23-rc9-1avb #24) [ 1595.480081] EIP is at toshiba_acpi_init+0x143/0x15e [toshiba_acpi] Signed-off-by: Andrey Borzenkov =2D-- drivers/acpi/toshiba_acpi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index 13369b4..18660cc 100644 =2D-- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c @@ -591,9 +591,12 @@ static int __init toshiba_acpi_init(void) NULL, &toshiba_backlight_data); if (IS_ERR(toshiba_backlight_device)) { + int ret =3D PTR_ERR(toshiba_backlight_device); + printk(KERN_ERR "Could not register toshiba backlight device\n"); toshiba_backlight_device =3D NULL; toshiba_acpi_exit(); + return ret; } toshiba_backlight_device->props.max_brightness =3D=20 HCI_LCD_BRIGHTNESS_LEVELS - 1; =20 --nextPart2196261.t2e0JdY9dG Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQBHLfAcR6LMutpd94wRAmZ4AJ0fq9rYFjsxqJvRYDR0TZQCcyoZngCdG9bY pTcn5oZ/UMXyB+/w+9G7X0c= =v1cR -----END PGP SIGNATURE----- --nextPart2196261.t2e0JdY9dG--