This patch converts verify_area to access_ok in sound/
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/sound/core/hwdep.c | 2 +-
25-akpm/sound/core/seq/seq_clientmgr.c | 2 +-
25-akpm/sound/isa/sb/emu8000_patch.c | 4 ++--
25-akpm/sound/oss/btaudio.c | 6 +++---
25-akpm/sound/oss/soundcard.c | 8 ++++----
25-akpm/sound/pci/trident/trident_synth.c | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff -puN sound/core/hwdep.c~verify_area-cleanup-sound sound/core/hwdep.c
--- 25/sound/core/hwdep.c~verify_area-cleanup-sound 2005-03-03 22:09:25.000000000 -0800
+++ 25-akpm/sound/core/hwdep.c 2005-03-03 22:09:25.000000000 -0800
@@ -223,7 +223,7 @@ static int snd_hwdep_dsp_load(snd_hwdep_
/* check whether the dsp was already loaded */
if (hw->dsp_loaded & (1 << info.index))
return -EBUSY;
- if (verify_area(VERIFY_READ, info.image, info.length))
+ if (!access_ok(VERIFY_READ, info.image, info.length))
return -EFAULT;
err = hw->ops.dsp_load(hw, &info);
if (err < 0)
diff -puN sound/core/seq/seq_clientmgr.c~verify_area-cleanup-sound sound/core/seq/seq_clientmgr.c
--- 25/sound/core/seq/seq_clientmgr.c~verify_area-cleanup-sound 2005-03-03 22:09:25.000000000 -0800
+++ 25-akpm/sound/core/seq/seq_clientmgr.c 2005-03-03 22:09:25.000000000 -0800
@@ -375,7 +375,7 @@ static ssize_t snd_seq_read(struct file
if (!(snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_INPUT))
return -ENXIO;
- if (verify_area(VERIFY_WRITE, buf, count))
+ if (!access_ok(VERIFY_WRITE, buf, count))
return -EFAULT;
/* check client structures are in place */
diff -puN sound/isa/sb/emu8000_patch.c~verify_area-cleanup-sound sound/isa/sb/emu8000_patch.c
--- 25/sound/isa/sb/emu8000_patch.c~verify_area-cleanup-sound 2005-03-03 22:09:25.000000000 -0800
+++ 25-akpm/sound/isa/sb/emu8000_patch.c 2005-03-03 22:09:25.000000000 -0800
@@ -183,10 +183,10 @@ snd_emu8000_sample_new(snd_emux_t *rec,
}
if (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS) {
- if (verify_area(VERIFY_READ, data, sp->v.size))
+ if (!access_ok(VERIFY_READ, data, sp->v.size))
return -EFAULT;
} else {
- if (verify_area(VERIFY_READ, data, sp->v.size * 2))
+ if (!access_ok(VERIFY_READ, data, sp->v.size * 2))
return -EFAULT;
}
diff -puN sound/oss/btaudio.c~verify_area-cleanup-sound sound/oss/btaudio.c
--- 25/sound/oss/btaudio.c~verify_area-cleanup-sound 2005-03-03 22:09:25.000000000 -0800
+++ 25-akpm/sound/oss/btaudio.c 2005-03-03 22:09:25.000000000 -0800
@@ -558,7 +558,7 @@ static ssize_t btaudio_dsp_read(struct f
__s16 __user *dst = (__s16 __user *)(buffer + ret);
__s16 avg;
int n = ndst>>1;
- if (0 != verify_area(VERIFY_WRITE,dst,ndst)) {
+ if (!access_ok(VERIFY_WRITE, dst, ndst)) {
if (0 == ret)
ret = -EFAULT;
break;
@@ -574,7 +574,7 @@ static ssize_t btaudio_dsp_read(struct f
__u8 *src = bta->buf_cpu + bta->read_offset;
__u8 __user *dst = buffer + ret;
int n = ndst;
- if (0 != verify_area(VERIFY_WRITE,dst,ndst)) {
+ if (!access_ok(VERIFY_WRITE, dst, ndst)) {
if (0 == ret)
ret = -EFAULT;
break;
@@ -587,7 +587,7 @@ static ssize_t btaudio_dsp_read(struct f
__u16 *src = (__u16*)(bta->buf_cpu + bta->read_offset);
__u16 __user *dst = (__u16 __user *)(buffer + ret);
int n = ndst>>1;
- if (0 != verify_area(VERIFY_WRITE,dst,ndst)) {
+ if (!access_ok(VERIFY_WRITE,dst,ndst)) {
if (0 == ret)
ret = -EFAULT;
break;
diff -puN sound/oss/soundcard.c~verify_area-cleanup-sound sound/oss/soundcard.c
--- 25/sound/oss/soundcard.c~verify_area-cleanup-sound 2005-03-03 22:09:25.000000000 -0800
+++ 25-akpm/sound/oss/soundcard.c 2005-03-03 22:09:25.000000000 -0800
@@ -341,11 +341,11 @@ static int sound_ioctl(struct inode *ino
if (len < 1 || len > 65536 || !p)
return -EFAULT;
if (_SIOC_DIR(cmd) & _SIOC_WRITE)
- if ((err = verify_area(VERIFY_READ, p, len)) < 0)
- return err;
+ if (!access_ok(VERIFY_READ, p, len))
+ return -EFAULT;
if (_SIOC_DIR(cmd) & _SIOC_READ)
- if ((err = verify_area(VERIFY_WRITE, p, len)) < 0)
- return err;
+ if (!access_ok(VERIFY_WRITE, p, len))
+ return -EFAULT;
}
DEB(printk("sound_ioctl(dev=%d, cmd=0x%x, arg=0x%x)\n", dev, cmd, arg));
if (cmd == OSS_GETVERSION)
diff -puN sound/pci/trident/trident_synth.c~verify_area-cleanup-sound sound/pci/trident/trident_synth.c
--- 25/sound/pci/trident/trident_synth.c~verify_area-cleanup-sound 2005-03-03 22:09:25.000000000 -0800
+++ 25-akpm/sound/pci/trident/trident_synth.c 2005-03-03 22:09:25.000000000 -0800
@@ -525,7 +525,7 @@ static int snd_trident_simple_put_sample
if (trident->synth.current_size + size > trident->synth.max_size)
return -ENOMEM;
- if (verify_area(VERIFY_READ, data, size))
+ if (!access_ok(VERIFY_READ, data, size))
return -EFAULT;
if (trident->tlb.entries) {
@@ -570,7 +570,7 @@ static int snd_trident_simple_get_sample
shift++;
size <<= shift;
- if (verify_area(VERIFY_WRITE, data, size))
+ if (!access_ok(VERIFY_WRITE, data, size))
return -EFAULT;
/* FIXME: not implemented yet */
_