Skip to content

Commit 385a592

Browse files
mchehabgregkh
authored andcommitted
siano: make it work again with CONFIG_VMAP_STACK
commit f9c85ee67164b37f9296eab3b754e543e4e96a1c upstream. Reported as a Kaffeine bug: https://bugs.kde.org/show_bug.cgi?id=375811 The USB control messages require DMA to work. We cannot pass a stack-allocated buffer, as it is not warranted that the stack would be into a DMA enabled area. On Kernel 4.9, the default is to not accept DMA on stack anymore on x86 architecture. On other architectures, this has been a requirement since Kernel 2.2. So, after this patch, this driver should likely work fine on all archs. Tested with USB ID 2040:5510: Hauppauge Windham Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f940011 commit 385a592

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

drivers/media/usb/siano/smsusb.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,22 +200,30 @@ static int smsusb_start_streaming(struct smsusb_device_t *dev)
200200
static int smsusb_sendrequest(void *context, void *buffer, size_t size)
201201
{
202202
struct smsusb_device_t *dev = (struct smsusb_device_t *) context;
203-
struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) buffer;
204-
int dummy;
203+
struct sms_msg_hdr *phdr;
204+
int dummy, ret;
205205

206206
if (dev->state != SMSUSB_ACTIVE) {
207207
pr_debug("Device not active yet\n");
208208
return -ENOENT;
209209
}
210210

211+
phdr = kmalloc(size, GFP_KERNEL);
212+
if (!phdr)
213+
return -ENOMEM;
214+
memcpy(phdr, buffer, size);
215+
211216
pr_debug("sending %s(%d) size: %d\n",
212217
smscore_translate_msg(phdr->msg_type), phdr->msg_type,
213218
phdr->msg_length);
214219

215220
smsendian_handle_tx_message((struct sms_msg_data *) phdr);
216-
smsendian_handle_message_header((struct sms_msg_hdr *)buffer);
217-
return usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2),
218-
buffer, size, &dummy, 1000);
221+
smsendian_handle_message_header((struct sms_msg_hdr *)phdr);
222+
ret = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2),
223+
phdr, size, &dummy, 1000);
224+
225+
kfree(phdr);
226+
return ret;
219227
}
220228

221229
static char *smsusb1_fw_lkup[] = {

0 commit comments

Comments
 (0)