GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-20 05:13:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

USB: debugging code shouldn't alter control flow

Browse source 
People have complained that debugging code shouldn't alter the flow of
control; it should restrict itself to printing out warnings and error
messages.  Bowing to popular opinion, this patch (as1518) changes the
debugging checks in usb_submit_urb() to follow this guideline.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: Keith Packard <keithp@keithp.com>
CC: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Stern 2012-02-02 15:38:14 -05:00 • committed by Greg Kroah-Hartman
parent c39c654fa2
commit 0cb54a3e47
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/core/urb.c
View file

@ -403,20 +403,17 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
* cause problems in HCDs if they get it wrong. * cause problems in HCDs if they get it wrong.
*/ */
{ {
unsigned int orig_flags = urb->transfer_flags;
unsigned int allowed; unsigned int allowed;
static int pipetypes[4] = { static int pipetypes[4] = {
PIPE_CONTROL, PIPE_ISOCHRONOUS, PIPE_BULK, PIPE_INTERRUPT PIPE_CONTROL, PIPE_ISOCHRONOUS, PIPE_BULK, PIPE_INTERRUPT
}; };
/* Check that the pipe's type matches the endpoint's type */ /* Check that the pipe's type matches the endpoint's type */
if (usb_pipetype(urb->pipe) != pipetypes[xfertype]) { if (usb_pipetype(urb->pipe) != pipetypes[xfertype])
dev_err(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n", dev_WARN(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n",
usb_pipetype(urb->pipe), pipetypes[xfertype]); usb_pipetype(urb->pipe), pipetypes[xfertype]);
return -EPIPE; /* The most suitable error code :-) */
}
/* enforce simple/standard policy */ /* Check against a simple/standard policy */
allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT | URB_DIR_MASK | allowed = (URB_NO_TRANSFER_DMA_MAP | URB_NO_INTERRUPT | URB_DIR_MASK |
URB_FREE_BUFFER); URB_FREE_BUFFER);
switch (xfertype) { switch (xfertype) {
@ -435,14 +432,12 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
allowed |= URB_ISO_ASAP; allowed |= URB_ISO_ASAP;
break; break;
} }
urb->transfer_flags &= allowed; allowed &= urb->transfer_flags;
/* fail if submitter gave bogus flags */ /* warn if submitter gave bogus flags */
if (urb->transfer_flags != orig_flags) { if (allowed != urb->transfer_flags)
dev_err(&dev->dev, "BOGUS urb flags, %x --> %x\n", dev_WARN(&dev->dev, "BOGUS urb flags, %x --> %x\n",
orig_flags, urb->transfer_flags); urb->transfer_flags, allowed);
return -EINVAL;
}
} }
#endif #endif
/* /*