Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262714AbVDMCZH (ORCPT ); Tue, 12 Apr 2005 22:25:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263079AbVDMCVG (ORCPT ); Tue, 12 Apr 2005 22:21:06 -0400 Received: from emailhub.stusta.mhn.de ([141.84.69.5]:33809 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S262107AbVDMCRo (ORCPT ); Tue, 12 Apr 2005 22:17:44 -0400 Date: Wed, 13 Apr 2005 04:17:42 +0200 From: Adrian Bunk To: Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [2.6 patch] sound/oss/rme96xx.c: fix two check after use Message-ID: <20050413021742.GT3631@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 61 This patch fixes two check after use found by the Coverity checker. Signed-off-by: Adrian Bunk --- This patch was already sent on: - 27 Mar 2005 --- 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/