Commit 4197f48e authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] janitor: oss/au1000 copy*user fixes

This patch catches insures proper return values from
copy_to/from_user calls.

From: Ron Gage <ron@rongage.org>
parent 4c126818
...@@ -1728,7 +1728,7 @@ static int au1000_ioctl(struct inode *inode, struct file *file, ...@@ -1728,7 +1728,7 @@ static int au1000_ioctl(struct inode *inode, struct file *file,
if (count < 0) if (count < 0)
count = 0; count = 0;
cinfo.blocks = count >> s->dma_adc.fragshift; cinfo.blocks = count >> s->dma_adc.fragshift;
return copy_to_user((void *) arg, &cinfo, sizeof(cinfo)); return copy_to_user((void *) arg, &cinfo, sizeof(cinfo)) ? -EFAULT : 0;
case SNDCTL_DSP_GETOPTR: case SNDCTL_DSP_GETOPTR:
if (!(file->f_mode & FMODE_READ)) if (!(file->f_mode & FMODE_READ))
...@@ -1751,7 +1751,7 @@ static int au1000_ioctl(struct inode *inode, struct file *file, ...@@ -1751,7 +1751,7 @@ static int au1000_ioctl(struct inode *inode, struct file *file,
if (count < 0) if (count < 0)
count = 0; count = 0;
cinfo.blocks = count >> s->dma_dac.fragshift; cinfo.blocks = count >> s->dma_dac.fragshift;
return copy_to_user((void *) arg, &cinfo, sizeof(cinfo)); return copy_to_user((void *) arg, &cinfo, sizeof(cinfo)) ? -EFAULT : 0;
case SNDCTL_DSP_GETBLKSIZE: case SNDCTL_DSP_GETBLKSIZE:
if (file->f_mode & FMODE_WRITE) if (file->f_mode & FMODE_WRITE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment