[PATCH 1/2] HID: kfree() NULL pointer cleanup

Subsystems: hid core layer, the rest

STALE5505d

3 messages, 2 authors, 2011-08-04 · open the first message on its own page

[PATCH 1/2] HID: kfree() NULL pointer cleanup

From: Bojan Prtvar <hidden>
Date: 2011-08-04 20:43:35

Checking for NULL pointers before kfree() is redundant.

Signed-off-by: Bojan Prtvar <redacted>
---
 drivers/hid/hid-prodikeys.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index 158b389..62f95d4 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -849,9 +849,7 @@ 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);
 	kfree(pk);
 	return ret;
 }
-- 
1.7.1

Re: [PATCH 1/2] HID: kfree() NULL pointer cleanup

From: Julia Lawall <hidden>
Date: 2011-08-04 20:48:11

On Thu, 4 Aug 2011, Bojan Prtvar wrote:
Checking for NULL pointers before kfree() is redundant.
I would find it even nicer to just add a new lavel to skip over the kfree 
in the case where pm is NULL.  It is statically apparent in the source 
code.

julia
quoted hunk
Signed-off-by: Bojan Prtvar <redacted>
---
 drivers/hid/hid-prodikeys.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
index 158b389..62f95d4 100644
--- a/drivers/hid/hid-prodikeys.c
+++ b/drivers/hid/hid-prodikeys.c
@@ -849,9 +849,7 @@ 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);
 	kfree(pk);
 	return ret;
 }
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] HID: kfree() NULL pointer cleanup

From: bojan prtvar <hidden>
Date: 2011-08-04 21:16:57

On Thu, Aug 4, 2011 at 10:48 PM, Julia Lawall [off-list ref] wrote:
On Thu, 4 Aug 2011, Bojan Prtvar wrote:

I would find it even nicer to just add a new lavel to skip over the kfree
in the case where pm is NULL.  It is statically apparent in the source
code.
Yes, it would be nicer. I'll send v2.

Regards,
Bojan
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help