Skip to content

L
linux
Commit b6aef039 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] sparse: btaudio annotation 

btaudio annotated
parent 936f0e7d
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 28 deletions
sound/oss/btaudio.c
View file @ b6aef039
...@@ -327,6 +327,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, ...@@ -327,6 +327,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
{ {
struct btaudio *bta = file->private_data; struct btaudio *bta = file->private_data;
int ret,val=0,i=0; int ret,val=0,i=0;
void __user *argp = (void __user *)arg;
if (cmd == SOUND_MIXER_INFO) { if (cmd == SOUND_MIXER_INFO) {
mixer_info info; mixer_info info;
...@@ -334,7 +335,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, ...@@ -334,7 +335,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
strlcpy(info.id,"bt878",sizeof(info.id)); strlcpy(info.id,"bt878",sizeof(info.id));
strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name)); strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name));
info.modify_counter = bta->mixcount; info.modify_counter = bta->mixcount;
if (copy_to_user((void *)arg, &info, sizeof(info))) if (copy_to_user(argp, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -343,16 +344,16 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, ...@@ -343,16 +344,16 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
memset(&info,0,sizeof(info)); memset(&info,0,sizeof(info));
strlcpy(info.id,"bt878",sizeof(info.id)-1); strlcpy(info.id,"bt878",sizeof(info.id)-1);
strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name)); strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name));
if (copy_to_user((void *)arg, &info, sizeof(info))) if (copy_to_user(argp, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
if (cmd == OSS_GETVERSION) if (cmd == OSS_GETVERSION)
return put_user(SOUND_VERSION, (int *)arg); return put_user(SOUND_VERSION, (int __user *)argp);
/* read */ /* read */
if (_SIOC_DIR(cmd) & _SIOC_WRITE) if (_SIOC_DIR(cmd) & _SIOC_WRITE)
if (get_user(val, (int *)arg)) if (get_user(val, (int __user *)argp))
return -EFAULT; return -EFAULT;
switch (cmd) { switch (cmd) {
...@@ -421,7 +422,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, ...@@ -421,7 +422,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
default: default:
return -EINVAL; return -EINVAL;
} }
if (put_user(ret, (int *)arg)) if (put_user(ret, (int __user *)argp))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -503,7 +504,7 @@ static int btaudio_dsp_release(struct inode *inode, struct file *file) ...@@ -503,7 +504,7 @@ static int btaudio_dsp_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static ssize_t btaudio_dsp_read(struct file *file, char *buffer, static ssize_t btaudio_dsp_read(struct file *file, char __user *buffer,
size_t swcount, loff_t *ppos) size_t swcount, loff_t *ppos)
{ {
struct btaudio *bta = file->private_data; struct btaudio *bta = file->private_data;
...@@ -554,7 +555,7 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer, ...@@ -554,7 +555,7 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer,
} else if (!bta->analog) { } else if (!bta->analog) {
/* stereo => mono (digital audio) */ /* stereo => mono (digital audio) */
__s16 *src = (__s16*)(bta->buf_cpu + bta->read_offset); __s16 *src = (__s16*)(bta->buf_cpu + bta->read_offset);
__s16 *dst = (__s16*)(buffer + ret); __s16 __user *dst = (__s16 __user *)(buffer + ret);
__s16 avg; __s16 avg;
int n = ndst>>1; int n = ndst>>1;
if (0 != verify_area(VERIFY_WRITE,dst,ndst)) { if (0 != verify_area(VERIFY_WRITE,dst,ndst)) {
...@@ -565,13 +566,13 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer, ...@@ -565,13 +566,13 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer,
for (; n; n--, dst++) { for (; n; n--, dst++) {
avg = (__s16)le16_to_cpu(*src) / 2; src++; avg = (__s16)le16_to_cpu(*src) / 2; src++;
avg += (__s16)le16_to_cpu(*src) / 2; src++; avg += (__s16)le16_to_cpu(*src) / 2; src++;
__put_user(cpu_to_le16(avg),(__u16*)(dst)); __put_user(cpu_to_le16(avg),dst);
} }
} else if (8 == bta->bits) { } else if (8 == bta->bits) {
/* copy + byte downsampling (audio A/D) */ /* copy + byte downsampling (audio A/D) */
__u8 *src = bta->buf_cpu + bta->read_offset; __u8 *src = bta->buf_cpu + bta->read_offset;
__u8 *dst = buffer + ret; __u8 __user *dst = buffer + ret;
int n = ndst; int n = ndst;
if (0 != verify_area(VERIFY_WRITE,dst,ndst)) { if (0 != verify_area(VERIFY_WRITE,dst,ndst)) {
if (0 == ret) if (0 == ret)
...@@ -579,12 +580,12 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer, ...@@ -579,12 +580,12 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer,
break; break;
} }
for (; n; n--, src += (1 << bta->sampleshift), dst++) for (; n; n--, src += (1 << bta->sampleshift), dst++)
__put_user(*src,(__u8*)(dst)); __put_user(*src, dst);
} else { } else {
/* copy + word downsampling (audio A/D) */ /* copy + word downsampling (audio A/D) */
__u16 *src = (__u16*)(bta->buf_cpu + bta->read_offset); __u16 *src = (__u16*)(bta->buf_cpu + bta->read_offset);
__u16 *dst = (__u16*)(buffer + ret); __u16 __user *dst = (__u16 __user *)(buffer + ret);
int n = ndst>>1; int n = ndst>>1;
if (0 != verify_area(VERIFY_WRITE,dst,ndst)) { if (0 != verify_area(VERIFY_WRITE,dst,ndst)) {
if (0 == ret) if (0 == ret)
...@@ -592,7 +593,7 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer, ...@@ -592,7 +593,7 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer,
break; break;
} }
for (; n; n--, src += (1 << bta->sampleshift), dst++) for (; n; n--, src += (1 << bta->sampleshift), dst++)
__put_user(*src,(__u16*)(dst)); __put_user(*src, dst);
} }
ret += ndst; ret += ndst;
...@@ -609,7 +610,7 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer, ...@@ -609,7 +610,7 @@ static ssize_t btaudio_dsp_read(struct file *file, char *buffer,
return ret; return ret;
} }
static ssize_t btaudio_dsp_write(struct file *file, const char *buffer, static ssize_t btaudio_dsp_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
return -EINVAL; return -EINVAL;
...@@ -620,15 +621,17 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -620,15 +621,17 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
{ {
struct btaudio *bta = file->private_data; struct btaudio *bta = file->private_data;
int s, i, ret, val = 0; int s, i, ret, val = 0;
void __user *argp = (void __user *)arg;
int __user *p = argp;
switch (cmd) { switch (cmd) {
case OSS_GETVERSION: case OSS_GETVERSION:
return put_user(SOUND_VERSION, (int *)arg); return put_user(SOUND_VERSION, p);
case SNDCTL_DSP_GETCAPS: case SNDCTL_DSP_GETCAPS:
return 0; return 0;
case SNDCTL_DSP_SPEED: case SNDCTL_DSP_SPEED:
if (get_user(val, (int*)arg)) if (get_user(val, p))
return -EFAULT; return -EFAULT;
if (bta->analog) { if (bta->analog) {
for (s = 0; s < 16; s++) for (s = 0; s < 16; s++)
...@@ -656,14 +659,14 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -656,14 +659,14 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
/* fall through */ /* fall through */
case SOUND_PCM_READ_RATE: case SOUND_PCM_READ_RATE:
if (bta->analog) { if (bta->analog) {
return put_user(HWBASE_AD*4/bta->decimation>>bta->sampleshift, (int*)arg); return put_user(HWBASE_AD*4/bta->decimation>>bta->sampleshift, p);
} else { } else {
return put_user(bta->rate, (int*)arg); return put_user(bta->rate, p);
} }
case SNDCTL_DSP_STEREO: case SNDCTL_DSP_STEREO:
if (!bta->analog) { if (!bta->analog) {
if (get_user(val, (int*)arg)) if (get_user(val, p))
return -EFAULT; return -EFAULT;
bta->channels = (val > 0) ? 2 : 1; bta->channels = (val > 0) ? 2 : 1;
bta->sampleshift = (bta->channels == 2) ? 0 : 1; bta->sampleshift = (bta->channels == 2) ? 0 : 1;
...@@ -681,11 +684,11 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -681,11 +684,11 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
"btaudio: stereo=0 channels=1\n"); "btaudio: stereo=0 channels=1\n");
} }
} }
return put_user((bta->channels)-1, (int *)arg); return put_user((bta->channels)-1, p);
case SNDCTL_DSP_CHANNELS: case SNDCTL_DSP_CHANNELS:
if (!bta->analog) { if (!bta->analog) {
if (get_user(val, (int*)arg)) if (get_user(val, p))
return -EFAULT; return -EFAULT;
bta->channels = (val > 1) ? 2 : 1; bta->channels = (val > 1) ? 2 : 1;
bta->sampleshift = (bta->channels == 2) ? 0 : 1; bta->sampleshift = (bta->channels == 2) ? 0 : 1;
...@@ -696,16 +699,16 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -696,16 +699,16 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
} }
/* fall through */ /* fall through */
case SOUND_PCM_READ_CHANNELS: case SOUND_PCM_READ_CHANNELS:
return put_user(bta->channels, (int *)arg); return put_user(bta->channels, p);
case SNDCTL_DSP_GETFMTS: /* Returns a mask */ case SNDCTL_DSP_GETFMTS: /* Returns a mask */
if (bta->analog) if (bta->analog)
return put_user(AFMT_S16_LE|AFMT_S8, (int*)arg); return put_user(AFMT_S16_LE|AFMT_S8, p);
else else
return put_user(AFMT_S16_LE, (int*)arg); return put_user(AFMT_S16_LE, p);
case SNDCTL_DSP_SETFMT: /* Selects ONE fmt*/ case SNDCTL_DSP_SETFMT: /* Selects ONE fmt*/
if (get_user(val, (int*)arg)) if (get_user(val, p))
return -EFAULT; return -EFAULT;
if (val != AFMT_QUERY) { if (val != AFMT_QUERY) {
if (bta->analog) if (bta->analog)
...@@ -722,10 +725,10 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -722,10 +725,10 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
if (debug) if (debug)
printk(KERN_DEBUG "btaudio: fmt: bits=%d\n",bta->bits); printk(KERN_DEBUG "btaudio: fmt: bits=%d\n",bta->bits);
return put_user((bta->bits==16) ? AFMT_S16_LE : AFMT_S8, return put_user((bta->bits==16) ? AFMT_S16_LE : AFMT_S8,
(int*)arg); p);
break; break;
case SOUND_PCM_READ_BITS: case SOUND_PCM_READ_BITS:
return put_user(bta->bits, (int*)arg); return put_user(bta->bits, p);
case SNDCTL_DSP_NONBLOCK: case SNDCTL_DSP_NONBLOCK:
file->f_flags |= O_NONBLOCK; file->f_flags |= O_NONBLOCK;
...@@ -745,7 +748,7 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -745,7 +748,7 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
if (0 != (ret = make_risc(bta))) if (0 != (ret = make_risc(bta)))
return ret; return ret;
} }
return put_user(bta->block_bytes>>bta->sampleshift,(int*)arg); return put_user(bta->block_bytes>>bta->sampleshift,p);
case SNDCTL_DSP_SYNC: case SNDCTL_DSP_SYNC:
/* NOP */ /* NOP */
...@@ -764,7 +767,7 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file, ...@@ -764,7 +767,7 @@ static int btaudio_dsp_ioctl(struct inode *inode, struct file *file,
"returns %d/%d/%d/%d\n", "returns %d/%d/%d/%d\n",
info.fragsize, info.fragstotal, info.fragsize, info.fragstotal,
info.bytes, info.fragments); info.bytes, info.fragments);
if (copy_to_user((void *)arg, &info, sizeof(info))) if (copy_to_user(argp, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7