mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Fix USB CB/CBI storage devices with CONFIG_VMAP_STACK=y
Some code (all error handling) submits CDBs that are allocated on the stack. This breaks with CB/CBI code that tries to create URB directly from SCSI command buffer - which happens to be in vmalloced memory with vmalloced kernel stacks. Let's make copy of the command in usb_stor_CB_transport. Signed-off-by: Petr Vandrovec <[email protected]> Cc: stable <[email protected]> Acked-by: Alan Stern <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
a25f0944ba
commit
2ce9d2272b
1 changed files with 6 additions and 1 deletions
|
|
@ -954,10 +954,15 @@ int usb_stor_CB_transport(struct scsi_cmnd *srb, struct us_data *us)
|
|||
|
||||
/* COMMAND STAGE */
|
||||
/* let's send the command via the control pipe */
|
||||
/*
|
||||
* Command is sometime (f.e. after scsi_eh_prep_cmnd) on the stack.
|
||||
* Stack may be vmallocated. So no DMA for us. Make a copy.
|
||||
*/
|
||||
memcpy(us->iobuf, srb->cmnd, srb->cmd_len);
|
||||
result = usb_stor_ctrl_transfer(us, us->send_ctrl_pipe,
|
||||
US_CBI_ADSC,
|
||||
USB_TYPE_CLASS | USB_RECIP_INTERFACE, 0,
|
||||
us->ifnum, srb->cmnd, srb->cmd_len);
|
||||
us->ifnum, us->iobuf, srb->cmd_len);
|
||||
|
||||
/* check the return code for the command */
|
||||
usb_stor_dbg(us, "Call to usb_stor_ctrl_transfer() returned %d\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue