Skip to content

L
linux
Commit f5ab74e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Add a few initial user pointer annotations to sound driver. 

Quite a few suspicious places here that pass kernel pointers
to the internal ioctl engine.
parent a7d02afe
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 94 deletions
include/sound/seq_kernel.h
View file @ f5ab74e6
...@@ -158,7 +158,7 @@ extern int snd_seq_create_kernel_client(snd_card_t *card, int client_index, snd_ ...@@ -158,7 +158,7 @@ extern int snd_seq_create_kernel_client(snd_card_t *card, int client_index, snd_
extern int snd_seq_delete_kernel_client(int client); extern int snd_seq_delete_kernel_client(int client);
extern int snd_seq_kernel_client_enqueue(int client, snd_seq_event_t *ev, int atomic, int hop); extern int snd_seq_kernel_client_enqueue(int client, snd_seq_event_t *ev, int atomic, int hop);
extern int snd_seq_kernel_client_dispatch(int client, snd_seq_event_t *ev, int atomic, int hop); extern int snd_seq_kernel_client_dispatch(int client, snd_seq_event_t *ev, int atomic, int hop);
extern int snd_seq_kernel_client_ctl(int client, unsigned int cmd, void *arg); extern int snd_seq_kernel_client_ctl(int client, unsigned int cmd, void __user *arg);
#define SNDRV_SEQ_EXT_MASK 0xc0000000 #define SNDRV_SEQ_EXT_MASK 0xc0000000
#define SNDRV_SEQ_EXT_USRPTR 0x80000000 #define SNDRV_SEQ_EXT_USRPTR 0x80000000
......
sound/core/seq/oss/seq_oss_device.h
View file @ f5ab74e6
...@@ -135,8 +135,8 @@ int snd_seq_oss_delete_client(void); ...@@ -135,8 +135,8 @@ int snd_seq_oss_delete_client(void);
int snd_seq_oss_open(struct file *file, int level); int snd_seq_oss_open(struct file *file, int level);
void snd_seq_oss_release(seq_oss_devinfo_t *dp); void snd_seq_oss_release(seq_oss_devinfo_t *dp);
int snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long arg); int snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long arg);
int snd_seq_oss_read(seq_oss_devinfo_t *dev, char *buf, int count); int snd_seq_oss_read(seq_oss_devinfo_t *dev, char __user *buf, int count);
int snd_seq_oss_write(seq_oss_devinfo_t *dp, const char *buf, int count, struct file *opt); int snd_seq_oss_write(seq_oss_devinfo_t *dp, const char __user *buf, int count, struct file *opt);
unsigned int snd_seq_oss_poll(seq_oss_devinfo_t *dp, struct file *file, poll_table * wait); unsigned int snd_seq_oss_poll(seq_oss_devinfo_t *dp, struct file *file, poll_table * wait);
void snd_seq_oss_reset(seq_oss_devinfo_t *dp); void snd_seq_oss_reset(seq_oss_devinfo_t *dp);
......
sound/core/seq/oss/seq_oss_ioctl.c
View file @ f5ab74e6
...@@ -35,7 +35,7 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg) ...@@ -35,7 +35,7 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg)
struct synth_info inf; struct synth_info inf;
struct midi_info minf; struct midi_info minf;
unsigned char ev[8]; unsigned char ev[8];
void *arg = (void*)carg; void __user *arg = (void __user *)carg;
snd_seq_event_t tmpev; snd_seq_event_t tmpev;
switch (cmd) { switch (cmd) {
......
sound/core/seq/oss/seq_oss_rw.c
View file @ f5ab74e6
...@@ -41,7 +41,7 @@ static int insert_queue(seq_oss_devinfo_t *dp, evrec_t *rec, struct file *opt); ...@@ -41,7 +41,7 @@ static int insert_queue(seq_oss_devinfo_t *dp, evrec_t *rec, struct file *opt);
*/ */
int int
snd_seq_oss_read(seq_oss_devinfo_t *dp, char *buf, int count) snd_seq_oss_read(seq_oss_devinfo_t *dp, char __user *buf, int count)
{ {
seq_oss_readq_t *readq = dp->readq; seq_oss_readq_t *readq = dp->readq;
int cnt, pos; int cnt, pos;
...@@ -81,7 +81,7 @@ snd_seq_oss_read(seq_oss_devinfo_t *dp, char *buf, int count) ...@@ -81,7 +81,7 @@ snd_seq_oss_read(seq_oss_devinfo_t *dp, char *buf, int count)
*/ */
int int
snd_seq_oss_write(seq_oss_devinfo_t *dp, const char *buf, int count, struct file *opt) snd_seq_oss_write(seq_oss_devinfo_t *dp, const char __user *buf, int count, struct file *opt)
{ {
int rc, c, p, ev_size; int rc, c, p, ev_size;
evrec_t rec; evrec_t rec;
......
sound/core/seq/oss/seq_oss_synth.c
View file @ f5ab74e6
...@@ -450,7 +450,7 @@ snd_seq_oss_synth_reset(seq_oss_devinfo_t *dp, int dev) ...@@ -450,7 +450,7 @@ snd_seq_oss_synth_reset(seq_oss_devinfo_t *dp, int dev)
*/ */
int int
snd_seq_oss_synth_load_patch(seq_oss_devinfo_t *dp, int dev, int fmt, snd_seq_oss_synth_load_patch(seq_oss_devinfo_t *dp, int dev, int fmt,
const char *buf, int p, int c) const char __user *buf, int p, int c)
{ {
seq_oss_synth_t *rec; seq_oss_synth_t *rec;
int rc; int rc;
......
sound/core/seq/oss/seq_oss_timer.c
View file @ f5ab74e6
...@@ -227,19 +227,19 @@ snd_seq_oss_timer_tempo(seq_oss_timer_t *timer, int value) ...@@ -227,19 +227,19 @@ snd_seq_oss_timer_tempo(seq_oss_timer_t *timer, int value)
* ioctls * ioctls
*/ */
int int
snd_seq_oss_timer_ioctl(seq_oss_timer_t *timer, unsigned int cmd, void *arg) snd_seq_oss_timer_ioctl(seq_oss_timer_t *timer, unsigned int cmd, int __user *arg)
{ {
int value; int value;
if (cmd == SNDCTL_SEQ_CTRLRATE) { if (cmd == SNDCTL_SEQ_CTRLRATE) {
debug_printk(("ctrl rate\n")); debug_printk(("ctrl rate\n"));
/* if *arg == 0, just return the current rate */ /* if *arg == 0, just return the current rate */
if (get_user(value, (int *)arg)) if (get_user(value, arg))
return -EFAULT; return -EFAULT;
if (value) if (value)
return -EINVAL; return -EINVAL;
value = ((timer->oss_tempo * timer->oss_timebase) + 30) / 60; value = ((timer->oss_tempo * timer->oss_timebase) + 30) / 60;
return put_user(value, (int *)arg) ? -EFAULT : 0; return put_user(value, arg) ? -EFAULT : 0;
} }
if (timer->dp->seq_mode == SNDRV_SEQ_OSS_MODE_SYNTH) if (timer->dp->seq_mode == SNDRV_SEQ_OSS_MODE_SYNTH)
...@@ -257,12 +257,12 @@ snd_seq_oss_timer_ioctl(seq_oss_timer_t *timer, unsigned int cmd, void *arg) ...@@ -257,12 +257,12 @@ snd_seq_oss_timer_ioctl(seq_oss_timer_t *timer, unsigned int cmd, void *arg)
return snd_seq_oss_timer_continue(timer); return snd_seq_oss_timer_continue(timer);
case SNDCTL_TMR_TEMPO: case SNDCTL_TMR_TEMPO:
debug_printk(("timer tempo\n")); debug_printk(("timer tempo\n"));
if (get_user(value, (int *)arg)) if (get_user(value, arg))
return -EFAULT; return -EFAULT;
return snd_seq_oss_timer_tempo(timer, value); return snd_seq_oss_timer_tempo(timer, value);
case SNDCTL_TMR_TIMEBASE: case SNDCTL_TMR_TIMEBASE:
debug_printk(("timer timebase\n")); debug_printk(("timer timebase\n"));
if (get_user(value, (int *)arg)) if (get_user(value, arg))
return -EFAULT; return -EFAULT;
if (value < MIN_OSS_TIMEBASE) if (value < MIN_OSS_TIMEBASE)
value = MIN_OSS_TIMEBASE; value = MIN_OSS_TIMEBASE;
......
sound/core/seq/oss/seq_oss_timer.h
View file @ f5ab74e6
...@@ -46,7 +46,7 @@ int snd_seq_oss_timer_continue(seq_oss_timer_t *timer); ...@@ -46,7 +46,7 @@ int snd_seq_oss_timer_continue(seq_oss_timer_t *timer);
int snd_seq_oss_timer_tempo(seq_oss_timer_t *timer, int value); int snd_seq_oss_timer_tempo(seq_oss_timer_t *timer, int value);
#define snd_seq_oss_timer_reset snd_seq_oss_timer_start #define snd_seq_oss_timer_reset snd_seq_oss_timer_start
int snd_seq_oss_timer_ioctl(seq_oss_timer_t *timer, unsigned int cmd, void *arg); int snd_seq_oss_timer_ioctl(seq_oss_timer_t *timer, unsigned int cmd, int __user *arg);
/* /*
* get current processed time * get current processed time
......
sound/core/seq/seq_clientmgr.c
View file @ f5ab74e6
...@@ -365,7 +365,7 @@ static int snd_seq_release(struct inode *inode, struct file *file) ...@@ -365,7 +365,7 @@ static int snd_seq_release(struct inode *inode, struct file *file)
* -EINVAL no enough user-space buffer to write the whole event * -EINVAL no enough user-space buffer to write the whole event
* -EFAULT seg. fault during copy to user space * -EFAULT seg. fault during copy to user space
*/ */
static ssize_t snd_seq_read(struct file *file, char *buf, size_t count, loff_t *offset) static ssize_t snd_seq_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
{ {
client_t *client = (client_t *) file->private_data; client_t *client = (client_t *) file->private_data;
fifo_t *fifo; fifo_t *fifo;
...@@ -959,7 +959,7 @@ static int check_event_type_and_length(snd_seq_event_t *ev) ...@@ -959,7 +959,7 @@ static int check_event_type_and_length(snd_seq_event_t *ev)
* -EMLINK too many hops * -EMLINK too many hops
* others depends on return value from driver callback * others depends on return value from driver callback
*/ */
static ssize_t snd_seq_write(struct file *file, const char *buf, size_t count, loff_t *offset) static ssize_t snd_seq_write(struct file *file, const char __user *buf, size_t count, loff_t *offset)
{ {
client_t *client = (client_t *) file->private_data; client_t *client = (client_t *) file->private_data;
int written = 0, len; int written = 0, len;
...@@ -1077,7 +1077,7 @@ static unsigned int snd_seq_poll(struct file *file, poll_table * wait) ...@@ -1077,7 +1077,7 @@ static unsigned int snd_seq_poll(struct file *file, poll_table * wait)
/* SYSTEM_INFO ioctl() */ /* SYSTEM_INFO ioctl() */
static int snd_seq_ioctl_system_info(client_t *client, unsigned long arg) static int snd_seq_ioctl_system_info(client_t *client, void __user *arg)
{ {
snd_seq_system_info_t info; snd_seq_system_info_t info;
...@@ -1090,20 +1090,20 @@ static int snd_seq_ioctl_system_info(client_t *client, unsigned long arg) ...@@ -1090,20 +1090,20 @@ static int snd_seq_ioctl_system_info(client_t *client, unsigned long arg)
info.cur_clients = client_usage.cur; info.cur_clients = client_usage.cur;
info.cur_queues = snd_seq_queue_get_cur_queues(); info.cur_queues = snd_seq_queue_get_cur_queues();
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* RUNNING_MODE ioctl() */ /* RUNNING_MODE ioctl() */
static int snd_seq_ioctl_running_mode(client_t *client, unsigned long arg) static int snd_seq_ioctl_running_mode(client_t *client, void __user *arg)
{ {
struct sndrv_seq_running_info info; struct sndrv_seq_running_info info;
client_t *cptr; client_t *cptr;
int err = 0; int err = 0;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
/* requested client number */ /* requested client number */
...@@ -1148,12 +1148,12 @@ static void get_client_info(client_t *cptr, snd_seq_client_info_t *info) ...@@ -1148,12 +1148,12 @@ static void get_client_info(client_t *cptr, snd_seq_client_info_t *info)
memset(info->reserved, 0, sizeof(info->reserved)); memset(info->reserved, 0, sizeof(info->reserved));
} }
static int snd_seq_ioctl_get_client_info(client_t * client, unsigned long arg) static int snd_seq_ioctl_get_client_info(client_t * client, void __user *arg)
{ {
client_t *cptr; client_t *cptr;
snd_seq_client_info_t client_info; snd_seq_client_info_t client_info;
if (copy_from_user(&client_info, (void*)arg, sizeof(client_info))) if (copy_from_user(&client_info, arg, sizeof(client_info)))
return -EFAULT; return -EFAULT;
/* requested client number */ /* requested client number */
...@@ -1164,18 +1164,18 @@ static int snd_seq_ioctl_get_client_info(client_t * client, unsigned long arg) ...@@ -1164,18 +1164,18 @@ static int snd_seq_ioctl_get_client_info(client_t * client, unsigned long arg)
get_client_info(cptr, &client_info); get_client_info(cptr, &client_info);
snd_seq_client_unlock(cptr); snd_seq_client_unlock(cptr);
if (copy_to_user((void*)arg, &client_info, sizeof(client_info))) if (copy_to_user(arg, &client_info, sizeof(client_info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* CLIENT_INFO ioctl() */ /* CLIENT_INFO ioctl() */
static int snd_seq_ioctl_set_client_info(client_t * client, unsigned long arg) static int snd_seq_ioctl_set_client_info(client_t * client, void __user *arg)
{ {
snd_seq_client_info_t client_info; snd_seq_client_info_t client_info;
if (copy_from_user(&client_info, (void*)arg, sizeof(client_info))) if (copy_from_user(&client_info, arg, sizeof(client_info)))
return -EFAULT; return -EFAULT;
/* it is not allowed to set the info fields for an another client */ /* it is not allowed to set the info fields for an another client */
...@@ -1201,13 +1201,13 @@ static int snd_seq_ioctl_set_client_info(client_t * client, unsigned long arg) ...@@ -1201,13 +1201,13 @@ static int snd_seq_ioctl_set_client_info(client_t * client, unsigned long arg)
/* /*
* CREATE PORT ioctl() * CREATE PORT ioctl()
*/ */
static int snd_seq_ioctl_create_port(client_t * client, unsigned long arg) static int snd_seq_ioctl_create_port(client_t * client, void __user *arg)
{ {
client_port_t *port; client_port_t *port;
snd_seq_port_info_t info; snd_seq_port_info_t info;
snd_seq_port_callback_t *callback; snd_seq_port_callback_t *callback;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
/* it is not allowed to create the port for an another client */ /* it is not allowed to create the port for an another client */
...@@ -1242,7 +1242,7 @@ static int snd_seq_ioctl_create_port(client_t * client, unsigned long arg) ...@@ -1242,7 +1242,7 @@ static int snd_seq_ioctl_create_port(client_t * client, unsigned long arg)
snd_seq_set_port_info(port, &info); snd_seq_set_port_info(port, &info);
snd_seq_system_client_ev_port_start(port->addr.client, port->addr.port); snd_seq_system_client_ev_port_start(port->addr.client, port->addr.port);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1251,13 +1251,13 @@ static int snd_seq_ioctl_create_port(client_t * client, unsigned long arg) ...@@ -1251,13 +1251,13 @@ static int snd_seq_ioctl_create_port(client_t * client, unsigned long arg)
/* /*
* DELETE PORT ioctl() * DELETE PORT ioctl()
*/ */
static int snd_seq_ioctl_delete_port(client_t * client, unsigned long arg) static int snd_seq_ioctl_delete_port(client_t * client, void __user *arg)
{ {
snd_seq_port_info_t info; snd_seq_port_info_t info;
int err; int err;
/* set passed parameters */ /* set passed parameters */
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
/* it is not allowed to remove the port for an another client */ /* it is not allowed to remove the port for an another client */
...@@ -1274,13 +1274,13 @@ static int snd_seq_ioctl_delete_port(client_t * client, unsigned long arg) ...@@ -1274,13 +1274,13 @@ static int snd_seq_ioctl_delete_port(client_t * client, unsigned long arg)
/* /*
* GET_PORT_INFO ioctl() (on any client) * GET_PORT_INFO ioctl() (on any client)
*/ */
static int snd_seq_ioctl_get_port_info(client_t *client, unsigned long arg) static int snd_seq_ioctl_get_port_info(client_t *client, void __user *arg)
{ {
client_t *cptr; client_t *cptr;
client_port_t *port; client_port_t *port;
snd_seq_port_info_t info; snd_seq_port_info_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
cptr = snd_seq_client_use_ptr(info.addr.client); cptr = snd_seq_client_use_ptr(info.addr.client);
if (cptr == NULL) if (cptr == NULL)
...@@ -1297,7 +1297,7 @@ static int snd_seq_ioctl_get_port_info(client_t *client, unsigned long arg) ...@@ -1297,7 +1297,7 @@ static int snd_seq_ioctl_get_port_info(client_t *client, unsigned long arg)
snd_seq_port_unlock(port); snd_seq_port_unlock(port);
snd_seq_client_unlock(cptr); snd_seq_client_unlock(cptr);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -1306,12 +1306,12 @@ static int snd_seq_ioctl_get_port_info(client_t *client, unsigned long arg) ...@@ -1306,12 +1306,12 @@ static int snd_seq_ioctl_get_port_info(client_t *client, unsigned long arg)
/* /*
* SET_PORT_INFO ioctl() (only ports on this/own client) * SET_PORT_INFO ioctl() (only ports on this/own client)
*/ */
static int snd_seq_ioctl_set_port_info(client_t * client, unsigned long arg) static int snd_seq_ioctl_set_port_info(client_t * client, void __user *arg)
{ {
client_port_t *port; client_port_t *port;
snd_seq_port_info_t info; snd_seq_port_info_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
if (info.addr.client != client->number) /* only set our own ports ! */ if (info.addr.client != client->number) /* only set our own ports ! */
...@@ -1381,14 +1381,14 @@ int snd_seq_client_notify_subscription(int client, int port, ...@@ -1381,14 +1381,14 @@ int snd_seq_client_notify_subscription(int client, int port,
/* /*
* add to port's subscription list IOCTL interface * add to port's subscription list IOCTL interface
*/ */
static int snd_seq_ioctl_subscribe_port(client_t * client, unsigned long arg) static int snd_seq_ioctl_subscribe_port(client_t * client, void __user *arg)
{ {
int result = -EINVAL; int result = -EINVAL;
client_t *receiver = NULL, *sender = NULL; client_t *receiver = NULL, *sender = NULL;
client_port_t *sport = NULL, *dport = NULL; client_port_t *sport = NULL, *dport = NULL;
snd_seq_port_subscribe_t subs; snd_seq_port_subscribe_t subs;
if (copy_from_user(&subs, (void*)arg, sizeof(subs))) if (copy_from_user(&subs, arg, sizeof(subs)))
return -EFAULT; return -EFAULT;
if ((receiver = snd_seq_client_use_ptr(subs.dest.client)) == NULL) if ((receiver = snd_seq_client_use_ptr(subs.dest.client)) == NULL)
...@@ -1425,14 +1425,14 @@ static int snd_seq_ioctl_subscribe_port(client_t * client, unsigned long arg) ...@@ -1425,14 +1425,14 @@ static int snd_seq_ioctl_subscribe_port(client_t * client, unsigned long arg)
/* /*
* remove from port's subscription list * remove from port's subscription list
*/ */
static int snd_seq_ioctl_unsubscribe_port(client_t * client, unsigned long arg) static int snd_seq_ioctl_unsubscribe_port(client_t * client, void __user *arg)
{ {
int result = -ENXIO; int result = -ENXIO;
client_t *receiver = NULL, *sender = NULL; client_t *receiver = NULL, *sender = NULL;
client_port_t *sport = NULL, *dport = NULL; client_port_t *sport = NULL, *dport = NULL;
snd_seq_port_subscribe_t subs; snd_seq_port_subscribe_t subs;
if (copy_from_user(&subs, (void*)arg, sizeof(subs))) if (copy_from_user(&subs, arg, sizeof(subs)))
return -EFAULT; return -EFAULT;
if ((receiver = snd_seq_client_use_ptr(subs.dest.client)) == NULL) if ((receiver = snd_seq_client_use_ptr(subs.dest.client)) == NULL)
...@@ -1466,13 +1466,13 @@ static int snd_seq_ioctl_unsubscribe_port(client_t * client, unsigned long arg) ...@@ -1466,13 +1466,13 @@ static int snd_seq_ioctl_unsubscribe_port(client_t * client, unsigned long arg)
/* CREATE_QUEUE ioctl() */ /* CREATE_QUEUE ioctl() */
static int snd_seq_ioctl_create_queue(client_t *client, unsigned long arg) static int snd_seq_ioctl_create_queue(client_t *client, void __user *arg)
{ {
snd_seq_queue_info_t info; snd_seq_queue_info_t info;
int result; int result;
queue_t *q; queue_t *q;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
result = snd_seq_queue_alloc(client->number, info.locked, info.flags); result = snd_seq_queue_alloc(client->number, info.locked, info.flags);
...@@ -1494,30 +1494,30 @@ static int snd_seq_ioctl_create_queue(client_t *client, unsigned long arg) ...@@ -1494,30 +1494,30 @@ static int snd_seq_ioctl_create_queue(client_t *client, unsigned long arg)
q->name[sizeof(q->name)-1] = 0; q->name[sizeof(q->name)-1] = 0;
queuefree(q); queuefree(q);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* DELETE_QUEUE ioctl() */ /* DELETE_QUEUE ioctl() */
static int snd_seq_ioctl_delete_queue(client_t *client, unsigned long arg) static int snd_seq_ioctl_delete_queue(client_t *client, void __user *arg)
{ {
snd_seq_queue_info_t info; snd_seq_queue_info_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
return snd_seq_queue_delete(client->number, info.queue); return snd_seq_queue_delete(client->number, info.queue);
} }
/* GET_QUEUE_INFO ioctl() */ /* GET_QUEUE_INFO ioctl() */
static int snd_seq_ioctl_get_queue_info(client_t *client, unsigned long arg) static int snd_seq_ioctl_get_queue_info(client_t *client, void __user *arg)
{ {
snd_seq_queue_info_t info; snd_seq_queue_info_t info;
queue_t *q; queue_t *q;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
q = queueptr(info.queue); q = queueptr(info.queue);
...@@ -1532,19 +1532,19 @@ static int snd_seq_ioctl_get_queue_info(client_t *client, unsigned long arg) ...@@ -1532,19 +1532,19 @@ static int snd_seq_ioctl_get_queue_info(client_t *client, unsigned long arg)
info.name[sizeof(info.name)-1] = 0; info.name[sizeof(info.name)-1] = 0;
queuefree(q); queuefree(q);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* SET_QUEUE_INFO ioctl() */ /* SET_QUEUE_INFO ioctl() */
static int snd_seq_ioctl_set_queue_info(client_t *client, unsigned long arg) static int snd_seq_ioctl_set_queue_info(client_t *client, void __user *arg)
{ {
snd_seq_queue_info_t info; snd_seq_queue_info_t info;
queue_t *q; queue_t *q;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
if (info.owner != client->number) if (info.owner != client->number)
...@@ -1575,12 +1575,12 @@ static int snd_seq_ioctl_set_queue_info(client_t *client, unsigned long arg) ...@@ -1575,12 +1575,12 @@ static int snd_seq_ioctl_set_queue_info(client_t *client, unsigned long arg)
} }
/* GET_NAMED_QUEUE ioctl() */ /* GET_NAMED_QUEUE ioctl() */
static int snd_seq_ioctl_get_named_queue(client_t *client, unsigned long arg) static int snd_seq_ioctl_get_named_queue(client_t *client, void __user *arg)
{ {
snd_seq_queue_info_t info; snd_seq_queue_info_t info;
queue_t *q; queue_t *q;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
q = snd_seq_queue_find_name(info.name); q = snd_seq_queue_find_name(info.name);
...@@ -1591,20 +1591,20 @@ static int snd_seq_ioctl_get_named_queue(client_t *client, unsigned long arg) ...@@ -1591,20 +1591,20 @@ static int snd_seq_ioctl_get_named_queue(client_t *client, unsigned long arg)
info.locked = q->locked; info.locked = q->locked;
queuefree(q); queuefree(q);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* GET_QUEUE_STATUS ioctl() */ /* GET_QUEUE_STATUS ioctl() */
static int snd_seq_ioctl_get_queue_status(client_t * client, unsigned long arg) static int snd_seq_ioctl_get_queue_status(client_t * client, void __user *arg)
{ {
snd_seq_queue_status_t status; snd_seq_queue_status_t status;
queue_t *queue; queue_t *queue;
seq_timer_t *tmr; seq_timer_t *tmr;
if (copy_from_user(&status, (void*)arg, sizeof(status))) if (copy_from_user(&status, arg, sizeof(status)))
return -EFAULT; return -EFAULT;
queue = queueptr(status.queue); queue = queueptr(status.queue);
...@@ -1624,20 +1624,20 @@ static int snd_seq_ioctl_get_queue_status(client_t * client, unsigned long arg) ...@@ -1624,20 +1624,20 @@ static int snd_seq_ioctl_get_queue_status(client_t * client, unsigned long arg)
status.flags = queue->flags; status.flags = queue->flags;
queuefree(queue); queuefree(queue);
if (copy_to_user((void*)arg, &status, sizeof(status))) if (copy_to_user(arg, &status, sizeof(status)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* GET_QUEUE_TEMPO ioctl() */ /* GET_QUEUE_TEMPO ioctl() */
static int snd_seq_ioctl_get_queue_tempo(client_t * client, unsigned long arg) static int snd_seq_ioctl_get_queue_tempo(client_t * client, void __user *arg)
{ {
snd_seq_queue_tempo_t tempo; snd_seq_queue_tempo_t tempo;
queue_t *queue; queue_t *queue;
seq_timer_t *tmr; seq_timer_t *tmr;
if (copy_from_user(&tempo, (void*)arg, sizeof(tempo))) if (copy_from_user(&tempo, arg, sizeof(tempo)))
return -EFAULT; return -EFAULT;
queue = queueptr(tempo.queue); queue = queueptr(tempo.queue);
...@@ -1654,19 +1654,19 @@ static int snd_seq_ioctl_get_queue_tempo(client_t * client, unsigned long arg) ...@@ -1654,19 +1654,19 @@ static int snd_seq_ioctl_get_queue_tempo(client_t * client, unsigned long arg)
tempo.skew_base = tmr->skew_base; tempo.skew_base = tmr->skew_base;
queuefree(queue); queuefree(queue);
if (copy_to_user((void*)arg, &tempo, sizeof(tempo))) if (copy_to_user(arg, &tempo, sizeof(tempo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* SET_QUEUE_TEMPO ioctl() */ /* SET_QUEUE_TEMPO ioctl() */
static int snd_seq_ioctl_set_queue_tempo(client_t * client, unsigned long arg) static int snd_seq_ioctl_set_queue_tempo(client_t * client, void __user *arg)
{ {
int result; int result;
snd_seq_queue_tempo_t tempo; snd_seq_queue_tempo_t tempo;
if (copy_from_user(&tempo, (void*)arg, sizeof(tempo))) if (copy_from_user(&tempo, arg, sizeof(tempo)))
return -EFAULT; return -EFAULT;
if (snd_seq_queue_check_access(tempo.queue, client->number)) { if (snd_seq_queue_check_access(tempo.queue, client->number)) {
...@@ -1682,13 +1682,13 @@ static int snd_seq_ioctl_set_queue_tempo(client_t * client, unsigned long arg) ...@@ -1682,13 +1682,13 @@ static int snd_seq_ioctl_set_queue_tempo(client_t * client, unsigned long arg)
/* GET_QUEUE_TIMER ioctl() */ /* GET_QUEUE_TIMER ioctl() */
static int snd_seq_ioctl_get_queue_timer(client_t * client, unsigned long arg) static int snd_seq_ioctl_get_queue_timer(client_t * client, void __user *arg)
{ {
snd_seq_queue_timer_t timer; snd_seq_queue_timer_t timer;
queue_t *queue; queue_t *queue;
seq_timer_t *tmr; seq_timer_t *tmr;
if (copy_from_user(&timer, (void*)arg, sizeof(timer))) if (copy_from_user(&timer, arg, sizeof(timer)))
return -EFAULT; return -EFAULT;
queue = queueptr(timer.queue); queue = queueptr(timer.queue);
...@@ -1711,19 +1711,19 @@ static int snd_seq_ioctl_get_queue_timer(client_t * client, unsigned long arg) ...@@ -1711,19 +1711,19 @@ static int snd_seq_ioctl_get_queue_timer(client_t * client, unsigned long arg)
up(&queue->timer_mutex); up(&queue->timer_mutex);
queuefree(queue); queuefree(queue);
if (copy_to_user((void*)arg, &timer, sizeof(timer))) if (copy_to_user(arg, &timer, sizeof(timer)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* SET_QUEUE_TIMER ioctl() */ /* SET_QUEUE_TIMER ioctl() */
static int snd_seq_ioctl_set_queue_timer(client_t * client, unsigned long arg) static int snd_seq_ioctl_set_queue_timer(client_t * client, void __user *arg)
{ {
int result = 0; int result = 0;
snd_seq_queue_timer_t timer; snd_seq_queue_timer_t timer;
if (copy_from_user(&timer, (void*)arg, sizeof(timer))) if (copy_from_user(&timer, arg, sizeof(timer)))
return -EFAULT; return -EFAULT;
if (timer.type != SNDRV_SEQ_TIMER_ALSA) if (timer.type != SNDRV_SEQ_TIMER_ALSA)
...@@ -1759,12 +1759,12 @@ static int snd_seq_ioctl_set_queue_timer(client_t * client, unsigned long arg) ...@@ -1759,12 +1759,12 @@ static int snd_seq_ioctl_set_queue_timer(client_t * client, unsigned long arg)
/* GET_QUEUE_CLIENT ioctl() */ /* GET_QUEUE_CLIENT ioctl() */
static int snd_seq_ioctl_get_queue_client(client_t * client, unsigned long arg) static int snd_seq_ioctl_get_queue_client(client_t * client, void __user *arg)
{ {
snd_seq_queue_client_t info; snd_seq_queue_client_t info;
int used; int used;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
used = snd_seq_queue_is_used(info.queue, client->number); used = snd_seq_queue_is_used(info.queue, client->number);
...@@ -1773,19 +1773,19 @@ static int snd_seq_ioctl_get_queue_client(client_t * client, unsigned long arg) ...@@ -1773,19 +1773,19 @@ static int snd_seq_ioctl_get_queue_client(client_t * client, unsigned long arg)
info.used = used; info.used = used;
info.client = client->number; info.client = client->number;
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* SET_QUEUE_CLIENT ioctl() */ /* SET_QUEUE_CLIENT ioctl() */
static int snd_seq_ioctl_set_queue_client(client_t * client, unsigned long arg) static int snd_seq_ioctl_set_queue_client(client_t * client, void __user *arg)
{ {
int err; int err;
snd_seq_queue_client_t info; snd_seq_queue_client_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
if (info.used >= 0) { if (info.used >= 0) {
...@@ -1799,12 +1799,12 @@ static int snd_seq_ioctl_set_queue_client(client_t * client, unsigned long arg) ...@@ -1799,12 +1799,12 @@ static int snd_seq_ioctl_set_queue_client(client_t * client, unsigned long arg)
/* GET_CLIENT_POOL ioctl() */ /* GET_CLIENT_POOL ioctl() */
static int snd_seq_ioctl_get_client_pool(client_t * client, unsigned long arg) static int snd_seq_ioctl_get_client_pool(client_t * client, void __user *arg)
{ {
snd_seq_client_pool_t info; snd_seq_client_pool_t info;
client_t *cptr; client_t *cptr;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
cptr = snd_seq_client_use_ptr(info.client); cptr = snd_seq_client_use_ptr(info.client);
...@@ -1827,18 +1827,18 @@ static int snd_seq_ioctl_get_client_pool(client_t * client, unsigned long arg) ...@@ -1827,18 +1827,18 @@ static int snd_seq_ioctl_get_client_pool(client_t * client, unsigned long arg)
} }
snd_seq_client_unlock(cptr); snd_seq_client_unlock(cptr);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
/* SET_CLIENT_POOL ioctl() */ /* SET_CLIENT_POOL ioctl() */
static int snd_seq_ioctl_set_client_pool(client_t * client, unsigned long arg) static int snd_seq_ioctl_set_client_pool(client_t * client, void __user *arg)
{ {
snd_seq_client_pool_t info; snd_seq_client_pool_t info;
int rc; int rc;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
if (client->number != info.client) if (client->number != info.client)
...@@ -1877,11 +1877,11 @@ static int snd_seq_ioctl_set_client_pool(client_t * client, unsigned long arg) ...@@ -1877,11 +1877,11 @@ static int snd_seq_ioctl_set_client_pool(client_t * client, unsigned long arg)
/* REMOVE_EVENTS ioctl() */ /* REMOVE_EVENTS ioctl() */
static int snd_seq_ioctl_remove_events(client_t * client, unsigned long arg) static int snd_seq_ioctl_remove_events(client_t * client, void __user *arg)
{ {
snd_seq_remove_events_t info; snd_seq_remove_events_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
/* /*
...@@ -1906,7 +1906,7 @@ static int snd_seq_ioctl_remove_events(client_t * client, unsigned long arg) ...@@ -1906,7 +1906,7 @@ static int snd_seq_ioctl_remove_events(client_t * client, unsigned long arg)
/* /*
* get subscription info * get subscription info
*/ */
static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg) static int snd_seq_ioctl_get_subscription(client_t *client, void __user *arg)
{ {
int result; int result;
client_t *sender = NULL; client_t *sender = NULL;
...@@ -1914,7 +1914,7 @@ static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg) ...@@ -1914,7 +1914,7 @@ static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg)
snd_seq_port_subscribe_t subs; snd_seq_port_subscribe_t subs;
subscribers_t *p; subscribers_t *p;
if (copy_from_user(&subs, (void*)arg, sizeof(subs))) if (copy_from_user(&subs, arg, sizeof(subs)))
return -EFAULT; return -EFAULT;
result = -EINVAL; result = -EINVAL;
...@@ -1935,7 +1935,7 @@ static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg) ...@@ -1935,7 +1935,7 @@ static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg)
if (sender) if (sender)
snd_seq_client_unlock(sender); snd_seq_client_unlock(sender);
if (result >= 0) { if (result >= 0) {
if (copy_to_user((void*)arg, &subs, sizeof(subs))) if (copy_to_user(arg, &subs, sizeof(subs)))
return -EFAULT; return -EFAULT;
} }
return result; return result;
...@@ -1945,7 +1945,7 @@ static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg) ...@@ -1945,7 +1945,7 @@ static int snd_seq_ioctl_get_subscription(client_t *client, unsigned long arg)
/* /*
* get subscription info - check only its presence * get subscription info - check only its presence
*/ */
static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg) static int snd_seq_ioctl_query_subs(client_t *client, void __user *arg)
{ {
int result = -ENXIO; int result = -ENXIO;
client_t *cptr = NULL; client_t *cptr = NULL;
...@@ -1955,7 +1955,7 @@ static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg) ...@@ -1955,7 +1955,7 @@ static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg)
struct list_head *p; struct list_head *p;
int i; int i;
if (copy_from_user(&subs, (void*)arg, sizeof(subs))) if (copy_from_user(&subs, arg, sizeof(subs)))
return -EFAULT; return -EFAULT;
if ((cptr = snd_seq_client_use_ptr(subs.root.client)) == NULL) if ((cptr = snd_seq_client_use_ptr(subs.root.client)) == NULL)
...@@ -2004,7 +2004,7 @@ static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg) ...@@ -2004,7 +2004,7 @@ static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg)
if (cptr) if (cptr)
snd_seq_client_unlock(cptr); snd_seq_client_unlock(cptr);
if (result >= 0) { if (result >= 0) {
if (copy_to_user((void*)arg, &subs, sizeof(subs))) if (copy_to_user(arg, &subs, sizeof(subs)))
return -EFAULT; return -EFAULT;
} }
return result; return result;
...@@ -2014,12 +2014,12 @@ static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg) ...@@ -2014,12 +2014,12 @@ static int snd_seq_ioctl_query_subs(client_t *client, unsigned long arg)
/* /*
* query next client * query next client
*/ */
static int snd_seq_ioctl_query_next_client(client_t *client, unsigned long arg) static int snd_seq_ioctl_query_next_client(client_t *client, void __user *arg)
{ {
client_t *cptr = NULL; client_t *cptr = NULL;
snd_seq_client_info_t info; snd_seq_client_info_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
/* search for next client */ /* search for next client */
...@@ -2037,7 +2037,7 @@ static int snd_seq_ioctl_query_next_client(client_t *client, unsigned long arg) ...@@ -2037,7 +2037,7 @@ static int snd_seq_ioctl_query_next_client(client_t *client, unsigned long arg)
get_client_info(cptr, &info); get_client_info(cptr, &info);
snd_seq_client_unlock(cptr); snd_seq_client_unlock(cptr);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -2045,13 +2045,13 @@ static int snd_seq_ioctl_query_next_client(client_t *client, unsigned long arg) ...@@ -2045,13 +2045,13 @@ static int snd_seq_ioctl_query_next_client(client_t *client, unsigned long arg)
/* /*
* query next port * query next port
*/ */
static int snd_seq_ioctl_query_next_port(client_t *client, unsigned long arg) static int snd_seq_ioctl_query_next_port(client_t *client, void __user *arg)
{ {
client_t *cptr; client_t *cptr;
client_port_t *port = NULL; client_port_t *port = NULL;
snd_seq_port_info_t info; snd_seq_port_info_t info;
if (copy_from_user(&info, (void*)arg, sizeof(info))) if (copy_from_user(&info, arg, sizeof(info)))
return -EFAULT; return -EFAULT;
cptr = snd_seq_client_use_ptr(info.addr.client); cptr = snd_seq_client_use_ptr(info.addr.client);
if (cptr == NULL) if (cptr == NULL)
...@@ -2071,7 +2071,7 @@ static int snd_seq_ioctl_query_next_port(client_t *client, unsigned long arg) ...@@ -2071,7 +2071,7 @@ static int snd_seq_ioctl_query_next_port(client_t *client, unsigned long arg)
snd_seq_port_unlock(port); snd_seq_port_unlock(port);
snd_seq_client_unlock(cptr); snd_seq_client_unlock(cptr);
if (copy_to_user((void*)arg, &info, sizeof(info))) if (copy_to_user(arg, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -2080,7 +2080,7 @@ static int snd_seq_ioctl_query_next_port(client_t *client, unsigned long arg) ...@@ -2080,7 +2080,7 @@ static int snd_seq_ioctl_query_next_port(client_t *client, unsigned long arg)
static struct seq_ioctl_table { static struct seq_ioctl_table {
unsigned int cmd; unsigned int cmd;
int (*func)(client_t *client, unsigned long arg); int (*func)(client_t *client, void __user * arg);
} ioctl_tables[] = { } ioctl_tables[] = {
{ SNDRV_SEQ_IOCTL_SYSTEM_INFO, snd_seq_ioctl_system_info }, { SNDRV_SEQ_IOCTL_SYSTEM_INFO, snd_seq_ioctl_system_info },
{ SNDRV_SEQ_IOCTL_RUNNING_MODE, snd_seq_ioctl_running_mode }, { SNDRV_SEQ_IOCTL_RUNNING_MODE, snd_seq_ioctl_running_mode },
...@@ -2114,7 +2114,7 @@ static struct seq_ioctl_table { ...@@ -2114,7 +2114,7 @@ static struct seq_ioctl_table {
{ 0, NULL }, { 0, NULL },
}; };
static int snd_seq_do_ioctl(client_t *client, unsigned int cmd, unsigned long arg) static int snd_seq_do_ioctl(client_t *client, unsigned int cmd, void __user *arg)
{ {
struct seq_ioctl_table *p; struct seq_ioctl_table *p;
...@@ -2131,7 +2131,7 @@ static int snd_seq_do_ioctl(client_t *client, unsigned int cmd, unsigned long ar ...@@ -2131,7 +2131,7 @@ static int snd_seq_do_ioctl(client_t *client, unsigned int cmd, unsigned long ar
return -EFAULT; return -EFAULT;
for (p = ioctl_tables; p->cmd; p++) { for (p = ioctl_tables; p->cmd; p++) {
if (p->cmd == cmd) if (p->cmd == cmd)
return p->func(client, arg); return p->func(client, (void __user *) arg);
} }
snd_printd("seq unknown ioctl() 0x%x (type='%c', number=0x%2x)\n", snd_printd("seq unknown ioctl() 0x%x (type='%c', number=0x%2x)\n",
cmd, _IOC_TYPE(cmd), _IOC_NR(cmd)); cmd, _IOC_TYPE(cmd), _IOC_NR(cmd));
...@@ -2146,7 +2146,7 @@ static int snd_seq_ioctl(struct inode *inode, struct file *file, ...@@ -2146,7 +2146,7 @@ static int snd_seq_ioctl(struct inode *inode, struct file *file,
snd_assert(client != NULL, return -ENXIO); snd_assert(client != NULL, return -ENXIO);
return snd_seq_do_ioctl(client, cmd, arg); return snd_seq_do_ioctl(client, cmd, (void __user *) arg);
} }
...@@ -2315,7 +2315,7 @@ int snd_seq_kernel_client_dispatch(int client, snd_seq_event_t * ev, ...@@ -2315,7 +2315,7 @@ int snd_seq_kernel_client_dispatch(int client, snd_seq_event_t * ev,
* exported, called by kernel clients to perform same functions as with * exported, called by kernel clients to perform same functions as with
* userland ioctl() * userland ioctl()
*/ */
int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg) int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void __user *arg)
{ {
client_t *client; client_t *client;
mm_segment_t fs; mm_segment_t fs;
...@@ -2325,7 +2325,7 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg) ...@@ -2325,7 +2325,7 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg)
if (client == NULL) if (client == NULL)
return -ENXIO; return -ENXIO;
fs = snd_enter_user(); fs = snd_enter_user();
result = snd_seq_do_ioctl(client, cmd, (unsigned long)arg); result = snd_seq_do_ioctl(client, cmd, arg);
snd_leave_user(fs); snd_leave_user(fs);
return result; return result;
} }
......
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