aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Robertson <steven@strobe.cc>2010-07-21 16:38:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:30:58 -0700
commit064b8f10414d51ae972f80518e320dc5cff9f1f8 (patch)
tree5280ae9933b63877aebd48bf3c4a4d028a96cf80
parenta6b37a9ed03585d0e1e132d424569003be2abba2 (diff)
downloadlinux-2.6.34-ux500-064b8f10414d51ae972f80518e320dc5cff9f1f8.tar.gz
USB: resizing usbmon binary interface buffer causes protection faults
commit 33d973ad88ceb83ed1449592b7574b5b5bb33ac6 upstream. Enlarging the buffer size via the MON_IOCT_RING_SIZE ioctl causes general protection faults. It appears the culprit is an incorrect argument to mon_free_buff: instead of passing the size of the current buffer being freed, the size of the new buffer is passed. Use the correct size argument to mon_free_buff when changing the size of the buffer. Signed-off-by: Steven Robertson <steven@strobe.cc> Acked-by: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/mon/mon_bin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 61c76b13f0f..56c93cac24c 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -1009,7 +1009,7 @@ static int mon_bin_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
mutex_lock(&rp->fetch_lock);
spin_lock_irqsave(&rp->b_lock, flags);
- mon_free_buff(rp->b_vec, size/CHUNK_SIZE);
+ mon_free_buff(rp->b_vec, rp->b_size/CHUNK_SIZE);
kfree(rp->b_vec);
rp->b_vec = vec;
rp->b_size = size;