On Thursday 30 July 2009 09:55:22 Jonathan Woithe wrote:
> Hi all
>
> This patch consolidates the two patches posted by Bartlomiej Zolnierkiewicz
> and the NULL pointer patch which came out of a discussion with Julia Lawall.
> Some additional NULL pointer check tidy-ups have also been done.
>
> To summarise:
I think that for the increased readability and to preserve proper credits it
would be better to keep separate patches (updating the driver version can be
as well handled in an incremental patch).
I would also strongly insist on removing the following needless NULL pointer
checks introduced by this version. They may hide real bugs in the ACPI driver
code (which should make sure that we always have valid 'device' in the ACPI
driver methods and that it doesn't go away while the method executes) or in
the fujitsu-laptop itself (which has to always provide valid 'fujitsu_hotkey',
'fujitsu' and 'input' pointers and not free them while there are still some
users left).
If this is the case we should fix the underlying problems and not hide them
with the "defensive coding". While it could (sometimes) help in avoiding
the underlying issue it may also easily result in the whole new bag of issues
resulting from introducing the unexpected code paths and system states, i.e.
ACPI driver code assumes that the ACPI device is no longer used/referenced by
higher-layers (like input layer) and unregistered from the driver after
->remove method finishes -- this assumption will no longer be true in case of
premature return caused by 'device == NULL' check if 'device' is NULL (it will
never be NULL actually, this is just an example to explain the problem with
the "defensive coding" principle).
I understand the sentiment for the "defensive coding" methods (often caused by
the real need for them when working on components for the closed code software)
but they should be avoided in the open source software.
Thanks.
diff -u b/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
--- b/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c 2009-07-30 16:48:45.542784340 +0930
@@ -70,7 +70,7 @@
#include <linux/leds.h>
#endif
-#define FUJITSU_DRIVER_VERSION "0.5.0"
+#define FUJITSU_DRIVER_VERSION "0.6.0"
#define FUJITSU_LCD_N_LEVELS 8
@@ -321,7 +321,7 @@ vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBLL [%d]\n",
level);
- if (level < 0 || level >= fujitsu->max_brightness)
+ if (!fujitsu || level < 0 || level >= fujitsu->max_brightness)
return -EINVAL;
status = acpi_get_handle(fujitsu->acpi_handle, "SBLL", &handle);
@@ -349,7 +349,7 @@
vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBL2 [%d]\n",
level);
- if (level < 0 || level >= fujitsu->max_brightness)
+ if (!fujitsu || level < 0 || level >= fujitsu->max_brightness)
return -EINVAL;
status = acpi_get_handle(fujitsu->acpi_handle, "SBL2", &handle);
@@ -732,12 +732,21 @@
static int acpi_fujitsu_remove(struct acpi_device *device, int type)
{
- struct fujitsu_t *fujitsu = acpi_driver_data(device);
- struct input_dev *input = fujitsu->input;
+ struct fujitsu_t *fujitsu = NULL;
+ struct input_dev *input = NULL;
- input_unregister_device(input);
+ if (!device)
+ return -EINVAL;
- input_free_device(input);
+ fujitsu = acpi_driver_data(device);
+ if (!fujitsu)
+ return -EINVAL;
+ input = fujitsu->input;
+
+ if (input) {
+ input_unregister_device(input);
+ input_free_device(input);
+ }
fujitsu->acpi_handle = NULL;
@@ -941,8 +950,16 @@
static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type)
{
- struct fujitsu_hotkey_t *fujitsu_hotkey = acpi_driver_data(device);
- struct input_dev *input = fujitsu_hotkey->input;
+ struct fujitsu_hotkey_t *fujitsu_hotkey = NULL;
+ struct input_dev *input = NULL;
+
+ if (!device)
+ return -EINVAL;
+ fujitsu_hotkey = acpi_driver_data(device);
+ if (!fujitsu_hotkey)
+ return -EINVAL;
+
+ input = fujitsu_hotkey->input;
#ifdef CONFIG_LEDS_CLASS
if (fujitsu_hotkey->logolamp_registered)
@@ -952,9 +969,10 @@
led_classdev_unregister(&kblamps_led);
#endif
- input_unregister_device(input);
-
- input_free_device(input);
+ if (input) {
+ input_unregister_device(input);
+ input_free_device(input);
+ }
kfifo_free(fujitsu_hotkey->fifo);
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
