diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-09-21 17:03:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 07:17:42 -0700 |
| commit | 470967dc6c38696f853b7f338eb9d743c28a9e11 (patch) | |
| tree | 9dac40e966a5bb4a902f9cdb8ea0701fe964b85f /drivers/char | |
| parent | 734f3fa18d460995c8621cf2331b7fba88c977ce (diff) | |
| download | linux-3.10-470967dc6c38696f853b7f338eb9d743c28a9e11.tar.gz linux-3.10-470967dc6c38696f853b7f338eb9d743c28a9e11.tar.bz2 linux-3.10-470967dc6c38696f853b7f338eb9d743c28a9e11.zip | |
pcmcia: fix read buffer overflow
If count > 0 and dev->rlen == dev->rpos and dev->proto == 0 then we read
and write dev->rbuf[-1];
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 881934c068c..c250a31efa5 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c @@ -1017,7 +1017,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count, } } - if (dev->proto == 0 && count > dev->rlen - dev->rpos) { + if (dev->proto == 0 && count > dev->rlen - dev->rpos && i) { DEBUGP(4, dev, "T=0 and count > buffer\n"); dev->rbuf[i] = dev->rbuf[i - 1]; dev->rbuf[i - 1] = dev->procbyte; |