Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HID: logitech: don't use stack based dj_report structures

Browse source 
On a system with a logitech wireless keyboard/mouse and DMA-API debugging
enabled, this warning appears at boot:

kernel: WARNING: at lib/dma-debug.c:929 check_for_stack.part.12+0x70/0xa7()
kernel: Hardware name: MS-7593
kernel: uhci_hcd 0000:00:1d.1: DMA-API: device driver maps memory fromstack [addr=ffff8801b0079c29]

Make logi_dj_recv_query_paired_devices and logi_dj_recv_switch_to_dj_mode
use a structure allocated with kzalloc rather than a stack based one.

Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Marc Dionne 2012-06-01 18:12:14 -04:00 committed by Jiri Kosina
parent 3c2c4b73aa
commit d8dc3494f7
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/hid/hid-logitech-dj.c
View file

@ -436,27 +436,37 @@ static int logi_dj_recv_send_report(struct dj_receiver_dev *djrcv_dev,
static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
{ {
struct dj_report dj_report; struct dj_report *dj_report;
int retval;
memset(&dj_report, 0, sizeof(dj_report)); dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
dj_report.report_id = REPORT_ID_DJ_SHORT; if (!dj_report)
dj_report.device_index = 0xFF; return -ENOMEM;
dj_report.report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES; dj_report->report_id = REPORT_ID_DJ_SHORT;
return logi_dj_recv_send_report(djrcv_dev, &dj_report); 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, static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
unsigned timeout) unsigned timeout)
{ {
struct dj_report dj_report; struct dj_report *dj_report;
int retval;
memset(&dj_report, 0, sizeof(dj_report)); dj_report = kzalloc(sizeof(dj_report), GFP_KERNEL);
dj_report.report_id = REPORT_ID_DJ_SHORT; if (!dj_report)
dj_report.device_index = 0xFF; return -ENOMEM;
dj_report.report_type = REPORT_TYPE_CMD_SWITCH; dj_report->report_id = REPORT_ID_DJ_SHORT;
dj_report.report_params[CMD_SWITCH_PARAM_DEVBITFIELD] = 0x3F; dj_report->device_index = 0xFF;
dj_report.report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] = (u8)timeout; dj_report->report_type = REPORT_TYPE_CMD_SWITCH;
return logi_dj_recv_send_report(djrcv_dev, &dj_report); 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;
} }