Messages in this thread Patch in this message | | | Date | Sun, 27 Mar 2005 23:17:28 +0200 | From | Adrian Bunk <> | Subject | [2.6 patch] sound/oss/rme96xx.c: fix two check after use |
| |
This patch fixes two check after use found by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.12-rc1-mm3-full/sound/oss/rme96xx.c.old 2005-03-27 23:16:02.000000000 +0200 +++ linux-2.6.12-rc1-mm3-full/sound/oss/rme96xx.c 2005-03-27 23:16:11.000000000 +0200 @@ -1534,18 +1534,20 @@ static ssize_t rme96xx_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) { struct dmabuf *dma = (struct dmabuf *)file->private_data; ssize_t ret = 0; int cnt; /* number of bytes from "buffer" that will/can be used */ - int hop = count/dma->outchannels; + int hop; int hwp; int exact = (file->f_flags & O_NONBLOCK); if(dma == NULL || (dma->s) == NULL) return -ENXIO; + hop = count/dma->outchannels; + if (dma->mmapped || !dma->opened) return -ENXIO; if (!access_ok(VERIFY_READ, buffer, count)) return -EFAULT; @@ -1599,18 +1601,20 @@ static ssize_t rme96xx_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos) { struct dmabuf *dma = (struct dmabuf *)file->private_data; ssize_t ret = 0; int cnt; /* number of bytes from "buffer" that will/can be used */ - int hop = count/dma->inchannels; + int hop; int hwp; int exact = (file->f_flags & O_NONBLOCK); if(dma == NULL || (dma->s) == NULL) return -ENXIO; + hop = count/dma->inchannels; + if (dma->mmapped || !dma->opened) return -ENXIO; if (!access_ok(VERIFY_WRITE, buffer, count)) return -EFAULT; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |