Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c0a2a3 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Greg Kroah-Hartman
Browse files

USB: usbmon: fix read(2) 



There's a bug in the usbmon binary reader: When using read() to fetch
the packets and a packet's data is partially read, the next read call
will once again return up to len_cap bytes of data. The b_read counter
is not regarded when determining the remaining chunk size.

So, when dumping USB data with "cat /dev/usbmon0 > usbmon.trace" while
reading from a USB storage device and analyzing the dump file
afterwards it will get out of sync after a couple of packets.

Signed-off-by: default avatarIngo van Lil <inguin@gmx.de>
Signed-off-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ff349505

drivers/usb/mon/mon_bin.c

+4 −1
Original line number Diff line number Diff line
@@ -687,7 +687,10 @@ static ssize_t mon_bin_read(struct file *file, char __user *buf, 
	}



	if (rp->b_read >= sizeof(struct mon_bin_hdr)) {

		step_len = min(nbytes, (size_t)ep->len_cap);

		step_len = ep->len_cap;

		step_len -= rp->b_read - sizeof(struct mon_bin_hdr);

		if (step_len > nbytes)

			step_len = nbytes;

		offset = rp->b_out + PKT_SIZE;

		offset += rp->b_read - sizeof(struct mon_bin_hdr);

		if (offset >= rp->b_size)