Re: [PATCH] fujitsu-laptop: driver [un]registration fixes

Jonathan Woithe
2010-01-05T22:04:47Z

Hi

> On Tue, Jan 05, 2010 at 05:46:46PM +0100, Bartlomiej Zolnierkiewicz wrote:
> :
> > > > So what's the correct way to deal with that in this case? Something like
> > > >
> > > > -end:
> > > > +err_unregister_input_dev:
> > > > + input_unregister_device(input);
> > > > + goto err_stop;
> > > > err_free_input_dev:
> > > > input_free_device(input);
> > > > err_stop:
> > > >
> > > > (with a short comment to explain the goto) would circumvent the problem but
> > > > it looks ugly (at least to my eyes - I've never really liked "goto"s :-) ).
> > >
> > > Just do "input = NULL;" after calling input_unregister_device() -
> > > input_free_device() is like kfree() and will happily ignore passed NULL
> > > pointers.
> > >
> > > Or rearrange the code to register device last, when everything is ready.
> >
> > I don't see it fixed in Linus' tree or linux-next yet so here is a patch:
> > (thanks for noticing the issue and sorry for the delayed reply).

Yeah, sorry about that. I was going to do up a patch but got caught up on
other things over the past two weeks. It got close to the top of my TODO
list yesterday, but it seems you beat me to it. :-) Thanks.

Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>

Len: please apply.

Regards
jonathan

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] fujitsu-laptop: fix input_free_device() usage

input_free_device() must not be used after calling input_unregister_device()
since unregister likely drops the last reference to the device and it will
get freed by input core.

Fix all input_unregister_device()+input_free_device() occurences accordingly.

Noticed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
---
against current Linus' tree

drivers/platform/x86/fujitsu-laptop.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Index: b/drivers/platform/x86/fujitsu-laptop.c
===================================================================
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -724,6 +724,7 @@ static int acpi_fujitsu_add(struct acpi_

err_unregister_input_dev:
input_unregister_device(input);
+ input = NULL;
err_free_input_dev:
input_free_device(input);
err_stop:
@@ -737,8 +738,6 @@ static int acpi_fujitsu_remove(struct ac

input_unregister_device(input);

- input_free_device(input);
-
fujitsu->acpi_handle = NULL;

return 0;
@@ -929,6 +928,7 @@ static int acpi_fujitsu_hotkey_add(struc

err_unregister_input_dev:
input_unregister_device(input);
+ input = NULL;
err_free_input_dev:
input_free_device(input);
err_free_fifo:
@@ -952,8 +952,6 @@ static int acpi_fujitsu_hotkey_remove(st

input_unregister_device(input);

- input_free_device(input);
-
kfifo_free(&fujitsu_hotkey->fifo);

fujitsu_hotkey->acpi_handle = NULL;