Commit fca94748 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: usbmon: fix bug in mon_buff_area_shrink

This patch (as1299b) fixes a bug in an error-handling path of usbmon's
binary interface.  The storage area for URB data is divided into
fixed-size blocks.  If an URB's data can't be copied, the area
reserved for it should be decreased to the size of the truncated
information (rounded up to a block boundary).  Rounding up the amount
to be removed and subtracting it from the reserved size is definitely
the wrong thing to do.

Also, when the data for an isochronous URB can't be copied, we can
still copy the isoc packet descriptors.  In fact the current code does
copy the descriptors, but then sets the capture length to 0 so they
remain inaccessible.  The capture length should be reduced to the
length of the descriptors, not set to 0.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarPete Zaitcev <zaitcev@redhat.com>
CC: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5294bea4
...@@ -348,12 +348,12 @@ static unsigned int mon_buff_area_alloc_contiguous(struct mon_reader_bin *rp, ...@@ -348,12 +348,12 @@ static unsigned int mon_buff_area_alloc_contiguous(struct mon_reader_bin *rp,
/* /*
* Return a few (kilo-)bytes to the head of the buffer. * Return a few (kilo-)bytes to the head of the buffer.
* This is used if a DMA fetch fails. * This is used if a data fetch fails.
*/ */
static void mon_buff_area_shrink(struct mon_reader_bin *rp, unsigned int size) static void mon_buff_area_shrink(struct mon_reader_bin *rp, unsigned int size)
{ {
size = (size + PKT_ALIGN-1) & ~(PKT_ALIGN-1); /* size &= ~(PKT_ALIGN-1); -- we're called with aligned size */
rp->b_cnt -= size; rp->b_cnt -= size;
if (rp->b_in < size) if (rp->b_in < size)
rp->b_in += rp->b_size; rp->b_in += rp->b_size;
...@@ -433,6 +433,7 @@ static void mon_bin_event(struct mon_reader_bin *rp, struct urb *urb, ...@@ -433,6 +433,7 @@ static void mon_bin_event(struct mon_reader_bin *rp, struct urb *urb,
unsigned int urb_length; unsigned int urb_length;
unsigned int offset; unsigned int offset;
unsigned int length; unsigned int length;
unsigned int delta;
unsigned int ndesc, lendesc; unsigned int ndesc, lendesc;
unsigned char dir; unsigned char dir;
struct mon_bin_hdr *ep; struct mon_bin_hdr *ep;
...@@ -537,8 +538,10 @@ static void mon_bin_event(struct mon_reader_bin *rp, struct urb *urb, ...@@ -537,8 +538,10 @@ static void mon_bin_event(struct mon_reader_bin *rp, struct urb *urb,
if (length != 0) { if (length != 0) {
ep->flag_data = mon_bin_get_data(rp, offset, urb, length); ep->flag_data = mon_bin_get_data(rp, offset, urb, length);
if (ep->flag_data != 0) { /* Yes, it's 0x00, not '0' */ if (ep->flag_data != 0) { /* Yes, it's 0x00, not '0' */
ep->len_cap = 0; delta = (ep->len_cap + PKT_ALIGN-1) & ~(PKT_ALIGN-1);
mon_buff_area_shrink(rp, length); ep->len_cap -= length;
delta -= (ep->len_cap + PKT_ALIGN-1) & ~(PKT_ALIGN-1);
mon_buff_area_shrink(rp, delta);
} }
} else { } else {
ep->flag_data = data_tag; ep->flag_data = data_tag;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment