Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1526557

[PATCH 3/4] HID: magicmouse: make transfer buffers DMA capable

Show all headers | View raw

Kernel v4.9 strictly enforces DMA capable buffers, so we need to remove
buffers allocated on the stack.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
 drivers/hid/hid-magicmouse.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index d6fa496..20b40ad 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -493,7 +493,8 @@ static int magicmouse_input_configured(struct hid_device *hdev,
 static int magicmouse_probe(struct hid_device *hdev,
 	const struct hid_device_id *id)
 {
-	__u8 feature[] = { 0xd7, 0x01 };
+	const u8 feature[] = { 0xd7, 0x01 };
+	u8 *buf;
 	struct magicmouse_sc *msc;
 	struct hid_report *report;
 	int ret;
@@ -544,6 +545,12 @@ static int magicmouse_probe(struct hid_device *hdev,
 	}
 	report->size = 6;
 
+	buf = kmemdup(feature, sizeof(feature), GFP_KERNEL);
+	if (!buf) {
+		ret = -ENOMEM;
+		goto err_stop_hw;
+	}
+
 	/*
 	 * Some devices repond with 'invalid report id' when feature
 	 * report switching it into multitouch mode is sent to it.
@@ -552,8 +559,9 @@ static int magicmouse_probe(struct hid_device *hdev,
 	 * but there seems to be no other way of switching the mode.
 	 * Thus the super-ugly hacky success check below.
 	 */
-	ret = hid_hw_raw_request(hdev, feature[0], feature, sizeof(feature),
+	ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(feature),
 				HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+	kfree(buf);
 	if (ret != -EIO && ret != sizeof(feature)) {
 		hid_err(hdev, "unable to request touch data (%d)\n", ret);
 		goto err_stop_hw;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] HID: fix few non-DMA capable HID transfers Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-11-21 11:50 +0100
  [PATCH 3/4] HID: magicmouse: make transfer buffers DMA capable Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-11-21 11:50 +0100
  [PATCH 1/4] HID: cp2112: make transfer buffers DMA capable Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-11-21 11:50 +0100
  [PATCH 2/4] HID: lg: make transfer buffers DMA capable Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-11-21 11:50 +0100
    [PATCH] HID: lg: fix noderef.cocci warnings kbuild test robot <lkp@intel.com> - 2016-11-21 13:10 +0100
      Re: [PATCH] HID: lg: fix noderef.cocci warnings Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-11-21 15:20 +0100
        Re: [PATCH] HID: lg: fix noderef.cocci warnings Jiri Kosina <jikos@kernel.org> - 2016-11-22 11:50 +0100
          Re: [PATCH] HID: lg: fix noderef.cocci warnings Fengguang Wu <lkp@intel.com> - 2016-11-23 07:00 +0100
            Re: [PATCH] HID: lg: fix noderef.cocci warnings Julia Lawall <julia.lawall@lip6.fr> - 2016-11-23 08:10 +0100
    Re: [PATCH 2/4] HID: lg: make transfer buffers DMA capable kbuild test robot <lkp@intel.com> - 2016-11-21 13:10 +0100
  [PATCH 4/4] HID: rmi: make transfer buffers DMA capable Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-11-21 11:50 +0100
  Re: [PATCH 0/4] HID: fix few non-DMA capable HID transfers Jiri Kosina <jikos@kernel.org> - 2016-11-23 17:50 +0100

csiph-web