* [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup
@ 2011-08-04 21:46 Bojan Prtvar
2011-08-04 21:52 ` Jiri Kosina
0 siblings, 1 reply; 2+ messages in thread
From: Bojan Prtvar @ 2011-08-04 21:46 UTC (permalink / raw)
To: jkosina, julia; +Cc: linux-input, linux-kernel, kernel-janitors, Bojan Prtvar
Checking for NULL pointers before kfree() is redundant.
v2:
No need for freeing pm in case when it's not allocated.
Reported-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Bojan Prtvar <prtvar.b@gmail.com>
---
drivers/hid/hid-prodikeys.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index 158b389..f779009 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -816,7 +816,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
if (pm == NULL) {
hid_err(hdev, "can't alloc descriptor\n");
ret = -ENOMEM;
- goto err_free;
+ goto err_free_pk;
}
pm->pk = pk;
@@ -849,10 +849,10 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
err_stop:
hid_hw_stop(hdev);
err_free:
- if (pm != NULL)
- kfree(pm);
-
+ kfree(pm);
+err_free_pk:
kfree(pk);
+
return ret;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup
2011-08-04 21:46 [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup Bojan Prtvar
@ 2011-08-04 21:52 ` Jiri Kosina
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Kosina @ 2011-08-04 21:52 UTC (permalink / raw)
To: Bojan Prtvar; +Cc: julia, linux-input, linux-kernel, kernel-janitors
On Thu, 4 Aug 2011, Bojan Prtvar wrote:
> Checking for NULL pointers before kfree() is redundant.
> v2:
> No need for freeing pm in case when it's not allocated.
>
> Reported-by: Julia Lawall <julia@diku.dk>
> Signed-off-by: Bojan Prtvar <prtvar.b@gmail.com>
> ---
> drivers/hid/hid-prodikeys.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
> index 158b389..f779009 100644
> --- a/drivers/hid/hid-prodikeys.c
> +++ b/drivers/hid/hid-prodikeys.c
> @@ -816,7 +816,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
> if (pm == NULL) {
> hid_err(hdev, "can't alloc descriptor\n");
> ret = -ENOMEM;
> - goto err_free;
> + goto err_free_pk;
> }
>
> pm->pk = pk;
> @@ -849,10 +849,10 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
> err_stop:
> hid_hw_stop(hdev);
> err_free:
> - if (pm != NULL)
> - kfree(pm);
> -
> + kfree(pm);
> +err_free_pk:
> kfree(pk);
> +
> return ret;
> }
>
Applied, thanks to both.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-04 21:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-04 21:46 [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup Bojan Prtvar
2011-08-04 21:52 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).