diff options
| author | James Morris <jmorris@namei.org> | 2008-12-04 07:16:36 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-04 07:16:36 +0100 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /drivers/usb/mon/mon_bin.c | |
| parent | Merge branch 'serge-next' into next (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-ec98ce480ada787f2cfbd696980ff3564415505b.tar.xz linux-ec98ce480ada787f2cfbd696980ff3564415505b.zip | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/usb/mon/mon_bin.c')
| -rw-r--r-- | drivers/usb/mon/mon_bin.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index c9de3f027aab..e06810aef2df 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c @@ -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) |