From 90ea54521cda0b5a40882aae06939d65af0e013c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Jun 2014 20:57:19 -0700 Subject: [PATCH] 3.4-stable patches added patches: hid-logitech-don-t-use-stack-based-dj_report-structures.patch --- ...use-stack-based-dj_report-structures.patch | 84 +++++++++++++++++++ queue-3.4/series | 1 + 2 files changed, 85 insertions(+) create mode 100644 queue-3.4/hid-logitech-don-t-use-stack-based-dj_report-structures.patch diff --git a/queue-3.4/hid-logitech-don-t-use-stack-based-dj_report-structures.patch b/queue-3.4/hid-logitech-don-t-use-stack-based-dj_report-structures.patch new file mode 100644 index 00000000000..8a1d5ee57cb --- /dev/null +++ b/queue-3.4/hid-logitech-don-t-use-stack-based-dj_report-structures.patch @@ -0,0 +1,84 @@ +From 01d35d12e9a77448d7e6e5ab653ae8ff93fecd26 Mon Sep 17 00:00:00 2001 +From: Marc Dionne +Date: Fri, 1 Jun 2012 18:12:14 -0400 +Subject: HID: logitech: don't use stack based dj_report structures + +From: Marc Dionne + +commit d8dc3494f77a5cc3b274bae36f7e74e85cf8a407 upstream. + +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 +Signed-off-by: Jiri Kosina +Signed-off-by: Ben Hutchings +Cc: Yijing Wang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hid/hid-logitech-dj.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) + +--- a/drivers/hid/hid-logitech-dj.c ++++ b/drivers/hid/hid-logitech-dj.c +@@ -474,28 +474,38 @@ static int logi_dj_recv_send_report(stru + + 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.report_id = REPORT_ID_DJ_SHORT; +- dj_report.device_index = 0xFF; +- 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); ++ 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); ++ 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; + } + + diff --git a/queue-3.4/series b/queue-3.4/series index efad48ccb2c..75d179a9a8e 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -211,3 +211,4 @@ crypto-s390-fix-aes-xts-parameter-corruption.patch net-add-net_ratelimited_function-and-net_-level-_ratelimited-macros.patch xen-netfront-reduce-gso_max_size-to-account-for-max-tcp-header.patch pci-aspm-don-t-touch-aspm-if-forcibly-disabled.patch +hid-logitech-don-t-use-stack-based-dj_report-structures.patch -- 2.47.3