Skip to contentSkip to conversation

dj: memory scribble in logi_dj

PATCH RESEND In review Alan Cox 3 participants 3 messages Sep 4, 2012 – Sep 6, 2012

Subsystems (2)
lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH RESEND 1/1 dj: memory scribble in logi_dj

I've been sending this to the input list and maintainer for a month now with no response, so this time it goes directly to Linus.

From: Alan Cox <[email protected]>

Allocate a structure not a pointer to it !

---

 drivers/hid/hid-logitech-dj.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-logitech-dj.c +2 -2
index 0f9c146..4d524b5 100644
@@ -439,7 +439,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
 	struct dj_report *dj_report;
 	int retval;
 
-	dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
+	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
 	if (!dj_report)
 		return -ENOMEM;
 	dj_report->report_id = REPORT_ID_DJ_SHORT;
@@ -456,7 +456,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
 	struct dj_report *dj_report;
 	int retval;
 
-	dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
+	dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
 	if (!dj_report)
 		return -ENOMEM;
 	dj_report->report_id = REPORT_ID_DJ_SHORT;
Reviewed-by on v1 1/1
#1 lore raw

Hi Alan,

Sorry for not seeing this earlier.

Jiri, can this fall into upstream-fixes?

Thanks,
Benjamin

Quoted 40 lines · Alan Cox

I've been sending this to the input list and maintainer for a month now with no response, so this time it goes directly to Linus.

From: Alan Cox <[email protected]>

Allocate a structure not a pointer to it !

---

 drivers/hid/hid-logitech-dj.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-logitech-dj.c +2 -3
index 0f9c146..4d524b5 100644
@@ -439,7 +439,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
        struct dj_report *dj_report;
        int retval;
 
-       dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
+       dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
        if (!dj_report)
                return -ENOMEM;
        dj_report->report_id = REPORT_ID_DJ_SHORT;
@@ -456,7 +456,7 @@ static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
        struct dj_report *dj_report;
        int retval;
 
-       dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
+       dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
        if (!dj_report)
                return -ENOMEM;
        dj_report->report_id = REPORT_ID_DJ_SHORT;
 
--

To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 5 lines · Benjamin Tissoires

Sorry for not seeing this earlier.

Jiri, can this fall into upstream-fixes?

I have discussed this with Alan a few moments ago ... unfortunately none of the four resends has been sent directly to me (I would have expected at least the resent patch been sent directly to the maintainer as well), but just to the lists ... so it was lost between the cracks of lkml/linux-input.

Linus has just applied it directly today.

Thanks everybody,

Signature · 2 lines
Jiri Kosina
SUSE Labs