73 lines
1.9 KiB
Diff
73 lines
1.9 KiB
Diff
|
Memory allocated by vmalloc (including stack) can not be used for DMA,
|
||
|
|
i.e. data pointer on usb_control_msg() should not point to stack memory.
|
||
|
|
|
||
|
|
Resolves:
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=977558
|
||
|
|
|
||
|
|
Reported-and-tested-by: Andy Lawrence <dr.diesel@gmail.com>
|
||
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/bluetooth/ath3k.c | 38 +++++++++++++++++++++++++++++---------
|
||
|
|
1 file changed, 29 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
|
||
|
|
index 11f467c..81b636c 100644
|
||
|
|
--- a/drivers/bluetooth/ath3k.c
|
||
|
|
+++ b/drivers/bluetooth/ath3k.c
|
||
|
|
@@ -193,24 +193,44 @@ error:
|
||
|
|
|
||
|
|
static int ath3k_get_state(struct usb_device *udev, unsigned char *state)
|
||
|
|
{
|
||
|
|
- int pipe = 0;
|
||
|
|
+ int ret, pipe = 0;
|
||
|
|
+ char *buf;
|
||
|
|
+
|
||
|
|
+ buf = kmalloc(1, GFP_KERNEL);
|
||
|
|
+ if (!buf)
|
||
|
|
+ return -ENOMEM;
|
||
|
|
|
||
|
|
pipe = usb_rcvctrlpipe(udev, 0);
|
||
|
|
- return usb_control_msg(udev, pipe, ATH3K_GETSTATE,
|
||
|
|
- USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||
|
|
- state, 0x01, USB_CTRL_SET_TIMEOUT);
|
||
|
|
+ ret = usb_control_msg(udev, pipe, ATH3K_GETSTATE,
|
||
|
|
+ USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||
|
|
+ buf, 1, USB_CTRL_SET_TIMEOUT);
|
||
|
|
+
|
||
|
|
+ *state = *buf;
|
||
|
|
+ kfree(buf);
|
||
|
|
+
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
static int ath3k_get_version(struct usb_device *udev,
|
||
|
|
struct ath3k_version *version)
|
||
|
|
{
|
||
|
|
- int pipe = 0;
|
||
|
|
+ int ret, pipe = 0;
|
||
|
|
+ char *buf;
|
||
|
|
+ const int size = sizeof(struct ath3k_version);
|
||
|
|
+
|
||
|
|
+ buf = kmalloc(size, GFP_KERNEL);
|
||
|
|
+ if (!buf)
|
||
|
|
+ return -ENOMEM;
|
||
|
|
|
||
|
|
pipe = usb_rcvctrlpipe(udev, 0);
|
||
|
|
- return usb_control_msg(udev, pipe, ATH3K_GETVERSION,
|
||
|
|
- USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, version,
|
||
|
|
- sizeof(struct ath3k_version),
|
||
|
|
- USB_CTRL_SET_TIMEOUT);
|
||
|
|
+ ret = usb_control_msg(udev, pipe, ATH3K_GETVERSION,
|
||
|
|
+ USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||
|
|
+ buf, size, USB_CTRL_SET_TIMEOUT);
|
||
|
|
+
|
||
|
|
+ memcpy(version, buf, size);
|
||
|
|
+ kfree(buf);
|
||
|
|
+
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
static int ath3k_load_fwfile(struct usb_device *udev,
|
||
|
|
--
|
||
|
|
1.7.11.7
|