Re: [PATCH 3.4 214/214] HID: logitech: dont use stack based dj_report structures

[Yijing Wang]

>> -       dj_report.report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
>> -       return logi_dj_recv_send_report(djrcv_dev, &dj_report);
>> +       dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
> 
> This patch was unfortunately incorrect as is - it needs to allocate
> sizeof(struct dj_report) here and a little further down.  This was
> later fixed in mainline by 8a55ade7655, which should also be included
> if you take this - I don't see it in the current set.

Good catch, I'm so sorry, I missed this fix patch. Marc, thanks for your review.

Hi Greg, Can you cherry pick this fix patch?   upstream commit id: 8a55ade7655(dj: memory scribble in logi_dj).


Thanks!
Yijing.



> 
>> +       if (!dj_report)
>> +               return -ENOMEM;
>> +       dj_report->report_id = REPORT_ID_DJ_SHORT;
>> +       dj_report->device_index = 0xFF;
>> +       dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
>> +       retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
>> +       kfree(dj_report);
>> +       return retval;
>>  }
>>
>>
>>  static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
>>                                           unsigned timeout)
>>  {
>> -       struct dj_report dj_report;
>> +       struct dj_report *dj_report;
>> +       int retval;
>>
>> -       memset(&dj_report, 0, sizeof(dj_report));
>> -       dj_report.report_id = REPORT_ID_DJ_SHORT;
>> -       dj_report.device_index = 0xFF;
>> -       dj_report.report_type = REPORT_TYPE_CMD_SWITCH;
>> -       dj_report.report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
>> -       dj_report.report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
>> -       return logi_dj_recv_send_report(djrcv_dev, &dj_report);
>> +       dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
> 
> Same here.
> 
>> +       if (!dj_report)
>> +               return -ENOMEM;
>> +       dj_report->report_id = REPORT_ID_DJ_SHORT;
>> +       dj_report->device_index = 0xFF;
>> +       dj_report->report_type = REPORT_TYPE_CMD_SWITCH;
>> +       dj_report->report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F;
>> +       dj_report->report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout;
>> +       retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
>> +       kfree(dj_report);
>> +       return retval;
>>  }
> 
> Marc
> 
> .
> 


-- 
Thanks!
Yijing

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/