Skip to content

L
linux
Commit 18813ce3 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files
Options

[ALSA] Fix ioctl32 wrapper (for SPARC) 

IOCTL32 emulation
Fix ioctl32 wrapper design, using compat_alloc_user_space() now.
This will fix the crash on SPARC64.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1efef61e
Hide whitespace changes
Inline Side-by-side
Showing with 343 additions and 451 deletions
sound/core/ioctl32/hwdep32.c
View file @ 18813ce3
...@@ -36,24 +36,24 @@ struct sndrv_hwdep_dsp_image32 { ...@@ -36,24 +36,24 @@ struct sndrv_hwdep_dsp_image32 {
static inline int _snd_ioctl32_hwdep_dsp_image(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) static inline int _snd_ioctl32_hwdep_dsp_image(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
struct sndrv_hwdep_dsp_image data; struct sndrv_hwdep_dsp_image __user *data, *dst;
struct sndrv_hwdep_dsp_image32 data32; struct sndrv_hwdep_dsp_image32 __user *data32, *src;
mm_segment_t oldseg; compat_caddr_t ptr;
int err;
if (copy_from_user(&data32, (void __user *)arg, sizeof(data32))) data32 = compat_ptr(arg);
data = compat_alloc_user_space(sizeof(*data));
/* index and name */
if (copy_in_user(data, data32, 4 + 64))
return -EFAULT;
if (__get_user(ptr, &data32->image) ||
__put_user(compat_ptr(ptr), &data->image))
return -EFAULT; return -EFAULT;
memset(&data, 0, sizeof(data)); src = data32;
data.index = data32.index; dst = data;
memcpy(data.name, data32.name, sizeof(data.name)); COPY_CVT(length);
data.image = compat_ptr(data32.image); COPY_CVT(driver_data);
data.length = data32.length; return file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);
data.driver_data = data32.driver_data;
oldseg = get_fs();
set_fs(KERNEL_DS);
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)&data);
set_fs(oldseg);
return err;
} }
DEFINE_ALSA_IOCTL_ENTRY(hwdep_dsp_image, hwdep_dsp_image, SNDRV_HWDEP_IOCTL_DSP_LOAD); DEFINE_ALSA_IOCTL_ENTRY(hwdep_dsp_image, hwdep_dsp_image, SNDRV_HWDEP_IOCTL_DSP_LOAD);
......
sound/core/ioctl32/ioctl32.c
View file @ 18813ce3
...@@ -27,9 +27,11 @@ ...@@ -27,9 +27,11 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/control.h> #include <sound/control.h>
#include <sound/minors.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "ioctl32.h" #include "ioctl32.h"
/* /*
* register/unregister mappers * register/unregister mappers
* exported for other modules * exported for other modules
...@@ -93,43 +95,28 @@ struct sndrv_ctl_elem_list32 { ...@@ -93,43 +95,28 @@ struct sndrv_ctl_elem_list32 {
unsigned char reserved[50]; unsigned char reserved[50];
} /* don't set packed attribute here */; } /* don't set packed attribute here */;
#define CVT_sndrv_ctl_elem_list()\
{\
COPY(offset);\
COPY(space);\
COPY(used);\
COPY(count);\
CPTR(pids);\
}
static inline int _snd_ioctl32_ctl_elem_list(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) static inline int _snd_ioctl32_ctl_elem_list(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
struct sndrv_ctl_elem_list32 data32; struct sndrv_ctl_elem_list32 __user *data32;
struct sndrv_ctl_elem_list data; struct sndrv_ctl_elem_list __user *data;
mm_segment_t oldseg; compat_caddr_t ptr;
int err; int err;
if (copy_from_user(&data32, (void __user *)arg, sizeof(data32))) data32 = compat_ptr(arg);
data = compat_alloc_user_space(sizeof(*data));
/* offset, space, used, count */
if (copy_in_user(data, data32, 4 * sizeof(u32)))
return -EFAULT; return -EFAULT;
memset(&data, 0, sizeof(data)); /* pids */
data.offset = data32.offset; if (__get_user(ptr, &data32->pids) ||
data.space = data32.space; __put_user(compat_ptr(ptr), &data->pids))
data.used = data32.used; return -EFAULT;
data.count = data32.count; err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);
data.pids = compat_ptr(data32.pids);
oldseg = get_fs();
set_fs(KERNEL_DS);
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)&data);
set_fs(oldseg);
if (err < 0) if (err < 0)
return err; return err;
/* copy the result */ /* copy the result */
data32.offset = data.offset; if (copy_in_user(data32, data, 4 * sizeof(u32)))
data32.space = data.space;
data32.used = data.used;
data32.count = data.count;
//data.pids = data.pids;
if (copy_to_user((void __user *)arg, &data32, sizeof(data32)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -170,54 +157,59 @@ struct sndrv_ctl_elem_info32 { ...@@ -170,54 +157,59 @@ struct sndrv_ctl_elem_info32 {
static inline int _snd_ioctl32_ctl_elem_info(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) static inline int _snd_ioctl32_ctl_elem_info(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
struct sndrv_ctl_elem_info data; struct sndrv_ctl_elem_info __user *data, *src;
struct sndrv_ctl_elem_info32 data32; struct sndrv_ctl_elem_info32 __user *data32, *dst;
unsigned int type;
int err; int err;
mm_segment_t oldseg;
if (copy_from_user(&data32, (void __user *)arg, sizeof(data32))) data32 = compat_ptr(arg);
data = compat_alloc_user_space(sizeof(*data));
/* copy id */
if (copy_in_user(&data->id, &data32->id, sizeof(data->id)))
return -EFAULT; return -EFAULT;
memset(&data, 0, sizeof(data));
data.id = data32.id;
/* we need to copy the item index. /* we need to copy the item index.
* hope this doesn't break anything.. * hope this doesn't break anything..
*/ */
data.value.enumerated.item = data32.value.enumerated.item; if (copy_in_user(&data->value.enumerated.item,
oldseg = get_fs(); &data32->value.enumerated.item,
set_fs(KERNEL_DS); sizeof(data->value.enumerated.item)))
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)&data); return -EFAULT;
set_fs(oldseg); err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);
if (err < 0) if (err < 0)
return err; return err;
/* restore info to 32bit */ /* restore info to 32bit */
data32.id = data.id; /* for COPY_CVT macro */
data32.type = data.type; src = data;
data32.access = data.access; dst = data32;
data32.count = data.count; /* id, type, access, count */
data32.owner = data.owner; if (copy_in_user(&data32->id, &data->id, sizeof(data->id)) ||
switch (data.type) { copy_in_user(&data32->type, &data->type, 3 * sizeof(u32)))
return -EFAULT;
COPY_CVT(owner);
__get_user(type, &data->type);
switch (type) {
case SNDRV_CTL_ELEM_TYPE_BOOLEAN: case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
case SNDRV_CTL_ELEM_TYPE_INTEGER: case SNDRV_CTL_ELEM_TYPE_INTEGER:
data32.value.integer.min = data.value.integer.min; COPY_CVT(value.integer.min);
data32.value.integer.max = data.value.integer.max; COPY_CVT(value.integer.max);
data32.value.integer.step = data.value.integer.step; COPY_CVT(value.integer.step);
break; break;
case SNDRV_CTL_ELEM_TYPE_INTEGER64: case SNDRV_CTL_ELEM_TYPE_INTEGER64:
data32.value.integer64.min = data.value.integer64.min; if (copy_in_user(&data32->value.integer64,
data32.value.integer64.max = data.value.integer64.max; &data->value.integer64,
data32.value.integer64.step = data.value.integer64.step; sizeof(data->value.integer64)))
return -EFAULT;
break; break;
case SNDRV_CTL_ELEM_TYPE_ENUMERATED: case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
data32.value.enumerated.items = data.value.enumerated.items; if (copy_in_user(&data32->value.enumerated,
data32.value.enumerated.item = data.value.enumerated.item; &data->value.enumerated,
memcpy(data32.value.enumerated.name, data.value.enumerated.name, sizeof(data->value.enumerated)))
sizeof(data.value.enumerated.name)); return -EFAULT;
break; break;
default: default:
break; break;
} }
if (copy_to_user((void __user *)arg, &data32, sizeof(data32)))
return -EFAULT;
return 0; return 0;
} }
...@@ -250,128 +242,172 @@ struct sndrv_ctl_elem_value32 { ...@@ -250,128 +242,172 @@ struct sndrv_ctl_elem_value32 {
/* hmm, it's so hard to retrieve the value type from the control id.. */ /* hmm, it's so hard to retrieve the value type from the control id.. */
static int get_ctl_type(struct file *file, snd_ctl_elem_id_t *id) static int get_ctl_type(snd_card_t *card, snd_ctl_elem_id_t *id)
{ {
snd_ctl_file_t *ctl;
snd_kcontrol_t *kctl; snd_kcontrol_t *kctl;
snd_ctl_elem_info_t info; snd_ctl_elem_info_t info;
int err; int err;
ctl = file->private_data; down_read(&card->controls_rwsem);
kctl = snd_ctl_find_id(card, id);
down_read(&ctl->card->controls_rwsem);
kctl = snd_ctl_find_id(ctl->card, id);
if (! kctl) { if (! kctl) {
up_read(&ctl->card->controls_rwsem); up_read(&card->controls_rwsem);
return -ENXIO; return -ENXIO;
} }
info.id = *id; info.id = *id;
err = kctl->info(kctl, &info); err = kctl->info(kctl, &info);
up_read(&ctl->card->controls_rwsem); up_read(&card->controls_rwsem);
if (err >= 0) if (err >= 0)
err = info.type; err = info.type;
return err; return err;
} }
extern int snd_major;
static inline int _snd_ioctl32_ctl_elem_value(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) static inline int _snd_ioctl32_ctl_elem_value(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
struct sndrv_ctl_elem_value *data; struct sndrv_ctl_elem_value *data;
struct sndrv_ctl_elem_value32 *data32; struct sndrv_ctl_elem_value32 __user *data32;
snd_ctl_file_t *ctl;
int err, i; int err, i;
int type; int type;
mm_segment_t oldseg;
/* FIXME: check the sane ioctl.. */ /* sanity check */
if (imajor(file->f_dentry->d_inode) != snd_major ||
SNDRV_MINOR_DEVICE(iminor(file->f_dentry->d_inode)) != SNDRV_MINOR_CONTROL)
return -ENOTTY;
if ((ctl = file->private_data) == NULL)
return -ENOTTY;
data32 = compat_ptr(arg);
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kmalloc(sizeof(*data), GFP_KERNEL);
data32 = kmalloc(sizeof(*data32), GFP_KERNEL); if (data == NULL)
if (data == NULL || data32 == NULL) { return -ENOMEM;
err = -ENOMEM;
if (copy_from_user(&data->id, &data32->id, sizeof(data->id))) {
err = -EFAULT;
goto __end; goto __end;
} }
if (__get_user(data->indirect, &data32->indirect)) {
if (copy_from_user(data32, (void __user *)arg, sizeof(*data32))) {
err = -EFAULT; err = -EFAULT;
goto __end; goto __end;
} }
memset(data, 0, sizeof(*data)); /* FIXME: indirect access is not supported */
data->id = data32->id; if (data->indirect) {
data->indirect = data32->indirect; err = -EINVAL;
if (data->indirect) /* FIXME: this is not correct for long arrays */ goto __end;
data->value.integer.value_ptr = compat_ptr(data32->value.integer.value_ptr); }
type = get_ctl_type(file, &data->id); type = get_ctl_type(ctl->card, &data->id);
if (type < 0) { if (type < 0) {
err = type; err = type;
goto __end; goto __end;
} }
if (! data->indirect) {
switch (type) { switch (type) {
case SNDRV_CTL_ELEM_TYPE_BOOLEAN: case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
case SNDRV_CTL_ELEM_TYPE_INTEGER: case SNDRV_CTL_ELEM_TYPE_INTEGER:
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++) {
data->value.integer.value[i] = data32->value.integer.value[i]; int val;
break; if (__get_user(val, &data32->value.integer.value[i])) {
case SNDRV_CTL_ELEM_TYPE_INTEGER64: err = -EFAULT;
for (i = 0; i < 64; i++) goto __end;
data->value.integer64.value[i] = data32->value.integer64.value[i]; }
break; data->value.integer.value[i] = val;
case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
for (i = 0; i < 128; i++)
data->value.enumerated.item[i] = data32->value.enumerated.item[i];
break;
case SNDRV_CTL_ELEM_TYPE_BYTES:
memcpy(data->value.bytes.data, data32->value.bytes.data,
sizeof(data->value.bytes.data));
break;
case SNDRV_CTL_ELEM_TYPE_IEC958:
data->value.iec958 = data32->value.iec958;
break;
default:
printk("unknown type %d\n", type);
break;
} }
break;
case SNDRV_CTL_ELEM_TYPE_INTEGER64:
if (__copy_from_user(data->value.integer64.value,
data32->value.integer64.value,
sizeof(data->value.integer64.value))) {
err = -EFAULT;
goto __end;
}
break;
case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
if (__copy_from_user(data->value.enumerated.item,
data32->value.enumerated.item,
sizeof(data32->value.enumerated.item))) {
err = -EFAULT;
goto __end;
}
break;
case SNDRV_CTL_ELEM_TYPE_BYTES:
if (__copy_from_user(data->value.bytes.data,
data32->value.bytes.data,
sizeof(data32->value.bytes.data))) {
err = -EFAULT;
goto __end;
}
break;
case SNDRV_CTL_ELEM_TYPE_IEC958:
if (__copy_from_user(&data->value.iec958,
&data32->value.iec958,
sizeof(data32->value.iec958))) {
err = -EFAULT;
goto __end;
}
break;
default:
printk(KERN_ERR "snd_ioctl32_ctl_elem_value: unknown type %d\n", type);
err = -EINVAL;
goto __end;
} }
oldseg = get_fs(); if (native_ctl == SNDRV_CTL_IOCTL_ELEM_READ)
set_fs(KERNEL_DS); err = snd_ctl_elem_read(ctl->card, data);
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data); else
set_fs(oldseg); err = snd_ctl_elem_write(ctl, data);
if (err < 0) if (err < 0)
goto __end; goto __end;
/* restore info to 32bit */ /* restore info to 32bit */
if (! data->indirect) { switch (type) {
switch (type) { case SNDRV_CTL_ELEM_TYPE_BOOLEAN:
case SNDRV_CTL_ELEM_TYPE_BOOLEAN: case SNDRV_CTL_ELEM_TYPE_INTEGER:
case SNDRV_CTL_ELEM_TYPE_INTEGER: for (i = 0; i < 128; i++) {
for (i = 0; i < 128; i++) int val;
data32->value.integer.value[i] = data->value.integer.value[i]; val = data->value.integer.value[i];
break; if (__put_user(val, &data32->value.integer.value[i])) {
case SNDRV_CTL_ELEM_TYPE_INTEGER64: err = -EFAULT;
for (i = 0; i < 64; i++) goto __end;
data32->value.integer64.value[i] = data->value.integer64.value[i]; }
break; }
case SNDRV_CTL_ELEM_TYPE_ENUMERATED: break;
for (i = 0; i < 128; i++) case SNDRV_CTL_ELEM_TYPE_INTEGER64:
data32->value.enumerated.item[i] = data->value.enumerated.item[i]; if (__copy_to_user(data32->value.integer64.value,
break; data->value.integer64.value,
case SNDRV_CTL_ELEM_TYPE_BYTES: sizeof(data32->value.integer64.value))) {
memcpy(data32->value.bytes.data, data->value.bytes.data, err = -EFAULT;
sizeof(data->value.bytes.data)); goto __end;
break; }
case SNDRV_CTL_ELEM_TYPE_IEC958: break;
data32->value.iec958 = data->value.iec958; case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
break; if (__copy_to_user(data32->value.enumerated.item,
default: data->value.enumerated.item,
break; sizeof(data32->value.enumerated.item))) {
err = -EFAULT;
goto __end;
} }
break;
case SNDRV_CTL_ELEM_TYPE_BYTES:
if (__copy_to_user(data32->value.bytes.data,
data->value.bytes.data,
sizeof(data32->value.bytes.data))) {
err = -EFAULT;
goto __end;
}
break;
case SNDRV_CTL_ELEM_TYPE_IEC958:
if (__copy_to_user(&data32->value.iec958,
&data->value.iec958,
sizeof(data32->value.iec958))) {
err = -EFAULT;
goto __end;
}
break;
} }
err = 0; err = 0;
if (copy_to_user((void __user *)arg, data32, sizeof(*data32)))
err = -EFAULT;
__end: __end:
if (data32)
kfree(data32);
if (data) if (data)
kfree(data); kfree(data);
return err; return err;
......
sound/core/ioctl32/ioctl32.h
View file @ 18813ce3
...@@ -28,20 +28,37 @@ ...@@ -28,20 +28,37 @@
#include <linux/compat.h> #include <linux/compat.h>
#define COPY(x) (dst->x = src->x) #define COPY(x) \
#define CPTR(x) (dst->x = compat_ptr(src->x)) do { \
if (copy_in_user(&dst->x, &src->x, sizeof(dst->x))) \
return -EFAULT; \
} while (0)
#define COPY_ARRAY(x) \
do { \
if (copy_in_user(dst->x, src->x, sizeof(dst->x))) \
return -EFAULT; \
} while (0)
#define COPY_CVT(x) \
do { \
__typeof__(src->x) __val_tmp; \
if (get_user(__val_tmp, &src->x) || \
put_user(__val_tmp, &dst->x))\
return -EFAULT; \
} while (0)
#define convert_from_32(type, dstp, srcp)\ #define convert_from_32(type, dstp, srcp)\
{\ {\
struct sndrv_##type *dst = dstp;\ struct sndrv_##type __user *dst = dstp;\
struct sndrv_##type##32 *src = srcp;\ struct sndrv_##type##32 __user *src = srcp;\
CVT_##sndrv_##type();\ CVT_##sndrv_##type();\
} }
#define convert_to_32(type, dstp, srcp)\ #define convert_to_32(type, dstp, srcp)\
{\ {\
struct sndrv_##type *src = srcp;\ struct sndrv_##type __user *src = srcp;\
struct sndrv_##type##32 *dst = dstp;\ struct sndrv_##type##32 __user *dst = dstp;\
CVT_##sndrv_##type();\ CVT_##sndrv_##type();\
} }
...@@ -49,65 +66,19 @@ ...@@ -49,65 +66,19 @@
#define DEFINE_ALSA_IOCTL(type) \ #define DEFINE_ALSA_IOCTL(type) \
static inline int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)\ static inline int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)\
{\ {\
struct sndrv_##type##32 data32;\ struct sndrv_##type##32 __user *data32;\
struct sndrv_##type data;\ struct sndrv_##type __user *data;\
mm_segment_t oldseg;\
int err;\
if (copy_from_user(&data32, (void __user *)arg, sizeof(data32)))\
return -EFAULT;\
memset(&data, 0, sizeof(data));\
convert_from_32(type, &data, &data32);\
oldseg = get_fs();\
set_fs(KERNEL_DS);\
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)&data);\
set_fs(oldseg);\
if (err < 0) \
return err;\
if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\
convert_to_32(type, &data32, &data);\
if (copy_to_user((void __user *)arg, &data32, sizeof(data32)))\
return -EFAULT;\
}\
return 0;\
}
#define DEFINE_ALSA_IOCTL_BIG(type) \
static inline int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)\
{\
struct sndrv_##type##32 *data32;\
struct sndrv_##type *data;\
mm_segment_t oldseg;\
int err;\ int err;\
data32 = kmalloc(sizeof(*data32), GFP_KERNEL); \ data32 = compat_ptr(arg);\
data = kmalloc(sizeof(*data), GFP_KERNEL); \ data = compat_alloc_user_space(sizeof(*data));\
if (data32 == NULL || data == NULL) { \
err = -ENOMEM; \
goto __end; \
}\
if (copy_from_user(data32, (void __user *)arg, sizeof(*data32))) { \
err = -EFAULT; \
goto __end; \
}\
memset(data, 0, sizeof(*data));\
convert_from_32(type, data, data32);\ convert_from_32(type, data, data32);\
oldseg = get_fs();\
set_fs(KERNEL_DS);\
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);\ err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);\
set_fs(oldseg);\
if (err < 0) \ if (err < 0) \
goto __end;\ return err;\
err = 0;\
if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\ if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\
convert_to_32(type, data32, data);\ convert_to_32(type, data32, data);\
if (copy_to_user((void __user *)arg, data32, sizeof(*data32)))\
err = -EFAULT;\
}\ }\
__end:\ return 0;\
if (data)\
kfree(data);\
if (data32)\
kfree(data32);\
return err;\
} }
#define DEFINE_ALSA_IOCTL_ENTRY(name,type,native_ctl) \ #define DEFINE_ALSA_IOCTL_ENTRY(name,type,native_ctl) \
......
sound/core/ioctl32/pcm32.c
View file @ 18813ce3
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/minors.h>
#include "ioctl32.h" #include "ioctl32.h"
...@@ -41,23 +42,15 @@ struct sndrv_pcm_uframes_str32 { ...@@ -41,23 +42,15 @@ struct sndrv_pcm_uframes_str32 {
u32 val; u32 val;
}; };
#define CVT_sndrv_pcm_sframes_str() { COPY(val); } #define CVT_sndrv_pcm_sframes_str() { COPY_CVT(val); }
#define CVT_sndrv_pcm_uframes_str() { COPY(val); } #define CVT_sndrv_pcm_uframes_str() { COPY_CVT(val); }
struct sndrv_interval32 {
u32 min, max;
unsigned int openmin:1,
openmax:1,
integer:1,
empty:1;
};
struct sndrv_pcm_hw_params32 { struct sndrv_pcm_hw_params32 {
u32 flags; u32 flags;
struct sndrv_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; /* this must be identical */ struct sndrv_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; /* this must be identical */
struct sndrv_mask mres[5]; /* reserved masks */ struct sndrv_mask mres[5]; /* reserved masks */
struct sndrv_interval32 intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1]; struct sndrv_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - SNDRV_PCM_HW_PARAM_FIRST_INTERVAL + 1];
struct sndrv_interval ires[9]; /* reserved intervals */ struct sndrv_interval ires[9]; /* reserved intervals */
u32 rmask; u32 rmask;
u32 cmask; u32 cmask;
...@@ -69,31 +62,6 @@ struct sndrv_pcm_hw_params32 { ...@@ -69,31 +62,6 @@ struct sndrv_pcm_hw_params32 {
unsigned char reserved[64]; unsigned char reserved[64];
} __attribute__((packed)); } __attribute__((packed));
#define numberof(array) ARRAY_SIZE(array)
#define CVT_sndrv_pcm_hw_params()\
{\
unsigned int i;\
COPY(flags);\
for (i = 0; i < numberof(dst->masks); i++)\
COPY(masks[i]);\
for (i = 0; i < numberof(dst->intervals); i++) {\
COPY(intervals[i].min);\
COPY(intervals[i].max);\
COPY(intervals[i].openmin);\
COPY(intervals[i].openmax);\
COPY(intervals[i].integer);\
COPY(intervals[i].empty);\
}\
COPY(rmask);\
COPY(cmask);\
COPY(info);\
COPY(msbits);\
COPY(rate_num);\
COPY(rate_den);\
COPY(fifo_size);\
}
struct sndrv_pcm_sw_params32 { struct sndrv_pcm_sw_params32 {
s32 tstamp_mode; s32 tstamp_mode;
u32 period_step; u32 period_step;
...@@ -113,13 +81,13 @@ struct sndrv_pcm_sw_params32 { ...@@ -113,13 +81,13 @@ struct sndrv_pcm_sw_params32 {
COPY(tstamp_mode);\ COPY(tstamp_mode);\
COPY(period_step);\ COPY(period_step);\
COPY(sleep_min);\ COPY(sleep_min);\
COPY(avail_min);\ COPY_CVT(avail_min);\
COPY(xfer_align);\ COPY_CVT(xfer_align);\
COPY(start_threshold);\ COPY_CVT(start_threshold);\
COPY(stop_threshold);\ COPY_CVT(stop_threshold);\
COPY(silence_threshold);\ COPY_CVT(silence_threshold);\
COPY(silence_size);\ COPY_CVT(silence_size);\
COPY(boundary);\ COPY_CVT(boundary);\
} }
struct sndrv_pcm_channel_info32 { struct sndrv_pcm_channel_info32 {
...@@ -132,7 +100,7 @@ struct sndrv_pcm_channel_info32 { ...@@ -132,7 +100,7 @@ struct sndrv_pcm_channel_info32 {
#define CVT_sndrv_pcm_channel_info()\ #define CVT_sndrv_pcm_channel_info()\
{\ {\
COPY(channel);\ COPY(channel);\
COPY(offset);\ COPY_CVT(offset);\
COPY(first);\ COPY(first);\
COPY(step);\ COPY(step);\
} }
...@@ -154,16 +122,16 @@ struct sndrv_pcm_status32 { ...@@ -154,16 +122,16 @@ struct sndrv_pcm_status32 {
#define CVT_sndrv_pcm_status()\ #define CVT_sndrv_pcm_status()\
{\ {\
COPY(state);\ COPY(state);\
COPY(trigger_tstamp.tv_sec);\ COPY_CVT(trigger_tstamp.tv_sec);\
COPY(trigger_tstamp.tv_nsec);\ COPY_CVT(trigger_tstamp.tv_nsec);\
COPY(tstamp.tv_sec);\ COPY_CVT(tstamp.tv_sec);\
COPY(tstamp.tv_nsec);\ COPY_CVT(tstamp.tv_nsec);\
COPY(appl_ptr);\ COPY_CVT(appl_ptr);\
COPY(hw_ptr);\ COPY_CVT(hw_ptr);\
COPY(delay);\ COPY_CVT(delay);\
COPY(avail);\ COPY_CVT(avail);\
COPY(avail_max);\ COPY_CVT(avail_max);\
COPY(overrange);\ COPY_CVT(overrange);\
COPY(suspended_state);\ COPY(suspended_state);\
} }
...@@ -173,61 +141,73 @@ DEFINE_ALSA_IOCTL(pcm_sw_params); ...@@ -173,61 +141,73 @@ DEFINE_ALSA_IOCTL(pcm_sw_params);
DEFINE_ALSA_IOCTL(pcm_channel_info); DEFINE_ALSA_IOCTL(pcm_channel_info);
DEFINE_ALSA_IOCTL(pcm_status); DEFINE_ALSA_IOCTL(pcm_status);
/* recalcuate the boundary within 32bit */ /* sanity device check */
static void recalculate_boundary(struct file *file) extern int snd_major;
static int sanity_check_pcm(struct file *file)
{ {
snd_pcm_file_t *pcm_file; unsigned short minor;
snd_pcm_substream_t *substream; if (imajor(file->f_dentry->d_inode) != snd_major)
snd_pcm_runtime_t *runtime; return -ENOTTY;
minor = iminor(file->f_dentry->d_inode);
if (minor >= 256 ||
minor % SNDRV_MINOR_DEVICES < SNDRV_MINOR_PCM_PLAYBACK)
return -ENOTTY;
return 0;
}
/* FIXME: need to check whether fop->ioctl is sane */ /* recalcuate the boundary within 32bit */
if (! (pcm_file = file->private_data)) static void recalculate_boundary(snd_pcm_runtime_t *runtime)
return; {
if (! (substream = pcm_file->substream)) if (! runtime->buffer_size)
return;
if (! (runtime = substream->runtime))
return; return;
runtime->boundary = runtime->buffer_size; runtime->boundary = runtime->buffer_size;
while (runtime->boundary * 2 <= 0x7fffffffUL - runtime->buffer_size) while (runtime->boundary * 2 <= 0x7fffffffUL - runtime->buffer_size)
runtime->boundary *= 2; runtime->boundary *= 2;
} }
static inline int _snd_ioctl32_pcm_hw_params(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) /* both for HW_PARAMS and HW_REFINE */
static int _snd_ioctl32_pcm_hw_params(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
struct sndrv_pcm_hw_params32 *data32; struct sndrv_pcm_hw_params32 __user *data32;
struct sndrv_pcm_hw_params *data; struct sndrv_pcm_hw_params *data;
mm_segment_t oldseg; snd_pcm_file_t *pcm_file;
snd_pcm_substream_t *substream;
snd_pcm_runtime_t *runtime;
int err; int err;
data32 = kmalloc(sizeof(*data32), GFP_KERNEL); if (sanity_check_pcm(file))
return -ENOTTY;
if (! (pcm_file = file->private_data))
return -ENOTTY;
if (! (substream = pcm_file->substream))
return -ENOTTY;
if (! (runtime = substream->runtime))
return -ENOTTY;
data32 = compat_ptr(arg);
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kmalloc(sizeof(*data), GFP_KERNEL);
if (data32 == NULL || data == NULL) { if (data == NULL)
err = -ENOMEM; return -ENOMEM;
goto __end; if (copy_from_user(data, data32, sizeof(*data32))) {
}
if (copy_from_user(data32, (void __user *)arg, sizeof(*data32))) {
err = -EFAULT; err = -EFAULT;
goto __end; goto error;
} }
memset(data, 0, sizeof(*data)); if (native_ctl == SNDRV_PCM_IOCTL_HW_REFINE)
convert_from_32(pcm_hw_params, data, data32); err = snd_pcm_hw_refine(substream, data);
oldseg = get_fs(); else
set_fs(KERNEL_DS); err = snd_pcm_hw_params(substream, data);
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);
set_fs(oldseg);
if (err < 0) if (err < 0)
goto __end; goto error;
err = 0; if (copy_to_user(data32, data, sizeof(*data32)) ||
convert_to_32(pcm_hw_params, data32, data); __put_user((u32)data->fifo_size, &data32->fifo_size)) {
if (copy_to_user((void __user *)arg, data32, sizeof(*data32)))
err = -EFAULT; err = -EFAULT;
else goto error;
recalculate_boundary(file); }
__end:
if (data) if (native_ctl == SNDRV_PCM_IOCTL_HW_PARAMS)
kfree(data); recalculate_boundary(runtime);
if (data32) error:
kfree(data32); kfree(data);
return err; return err;
} }
...@@ -240,27 +220,27 @@ struct sndrv_xferi32 { ...@@ -240,27 +220,27 @@ struct sndrv_xferi32 {
u32 frames; u32 frames;
} __attribute__((packed)); } __attribute__((packed));
static inline int _snd_ioctl32_xferi(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) static int _snd_ioctl32_xferi(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
struct sndrv_xferi32 data32; struct sndrv_xferi32 data32;
struct sndrv_xferi data; struct sndrv_xferi __user *data;
mm_segment_t oldseg; snd_pcm_sframes_t result;
int err; int err;
if (copy_from_user(&data32, (void __user *)arg, sizeof(data32))) if (copy_from_user(&data32, (void __user *)arg, sizeof(data32)))
return -EFAULT; return -EFAULT;
memset(&data, 0, sizeof(data)); data = compat_alloc_user_space(sizeof(*data));
data.result = data32.result; if (put_user((snd_pcm_sframes_t)data32.result, &data->result) ||
data.buf = compat_ptr(data32.buf); __put_user(compat_ptr(data32.buf), &data->buf) ||
data.frames = data32.frames; __put_user((snd_pcm_uframes_t)data32.frames, &data->frames))
oldseg = get_fs(); return -EFAULT;
set_fs(KERNEL_DS); err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)&data);
set_fs(oldseg);
if (err < 0) if (err < 0)
return err; return err;
/* copy the result */ /* copy the result */
data32.result = data.result; if (__get_user(result, &data->result))
return -EFAULT;
data32.result = result;
if (copy_to_user((void __user *)arg, &data32, sizeof(data32))) if (copy_to_user((void __user *)arg, &data32, sizeof(data32)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -280,22 +260,24 @@ struct sndrv_xfern32 { ...@@ -280,22 +260,24 @@ struct sndrv_xfern32 {
* handler there expands again the same 128 pointers on stack, so it is better * handler there expands again the same 128 pointers on stack, so it is better
* to handle the function (calling pcm_readv/writev) directly in this handler. * to handle the function (calling pcm_readv/writev) directly in this handler.
*/ */
static inline int _snd_ioctl32_xfern(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl) static int _snd_ioctl32_xfern(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{ {
snd_pcm_file_t *pcm_file; snd_pcm_file_t *pcm_file;
snd_pcm_substream_t *substream; snd_pcm_substream_t *substream;
struct sndrv_xfern32 __user *srcptr = compat_ptr(arg);
struct sndrv_xfern32 data32; struct sndrv_xfern32 data32;
struct sndrv_xfern32 __user *srcptr = (void __user *)arg; void __user **bufs;
void __user **bufs = NULL;
int err = 0, ch, i; int err = 0, ch, i;
u32 __user *bufptr; u32 __user *bufptr;
mm_segment_t oldseg;
/* FIXME: need to check whether fop->ioctl is sane */ if (sanity_check_pcm(file))
return -ENOTTY;
pcm_file = file->private_data; if (! (pcm_file = file->private_data))
substream = pcm_file->substream; return -ENOTTY;
snd_assert(substream != NULL && substream->runtime, return -ENXIO); if (! (substream = pcm_file->substream))
return -ENOTTY;
if (! substream->runtime)
return -ENOTTY;
/* check validty of the command */ /* check validty of the command */
switch (native_ctl) { switch (native_ctl) {
...@@ -312,22 +294,21 @@ static inline int _snd_ioctl32_xfern(unsigned int fd, unsigned int cmd, unsigned ...@@ -312,22 +294,21 @@ static inline int _snd_ioctl32_xfern(unsigned int fd, unsigned int cmd, unsigned
} }
if ((ch = substream->runtime->channels) > 128) if ((ch = substream->runtime->channels) > 128)
return -EINVAL; return -EINVAL;
if (get_user(data32.frames, &srcptr->frames)) if (copy_from_user(&data32, (void __user *)arg, sizeof(data32)))
return -EFAULT; return -EFAULT;
__get_user(data32.bufs, &srcptr->bufs);
bufptr = compat_ptr(data32.bufs); bufptr = compat_ptr(data32.bufs);
bufs = kmalloc(sizeof(void *) * 128, GFP_KERNEL); bufs = kmalloc(sizeof(void __user *) * ch, GFP_KERNEL);
if (bufs == NULL) if (bufs == NULL)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < ch; i++) { for (i = 0; i < ch; i++) {
u32 ptr; u32 ptr;
if (get_user(ptr, bufptr)) if (get_user(ptr, bufptr)) {
kfree(bufs);
return -EFAULT; return -EFAULT;
}
bufs[ch] = compat_ptr(ptr); bufs[ch] = compat_ptr(ptr);
bufptr++; bufptr++;
} }
oldseg = get_fs();
set_fs(KERNEL_DS);
switch (native_ctl) { switch (native_ctl) {
case SNDRV_PCM_IOCTL_WRITEN_FRAMES: case SNDRV_PCM_IOCTL_WRITEN_FRAMES:
err = snd_pcm_lib_writev(substream, bufs, data32.frames); err = snd_pcm_lib_writev(substream, bufs, data32.frames);
...@@ -336,109 +317,15 @@ static inline int _snd_ioctl32_xfern(unsigned int fd, unsigned int cmd, unsigned ...@@ -336,109 +317,15 @@ static inline int _snd_ioctl32_xfern(unsigned int fd, unsigned int cmd, unsigned
err = snd_pcm_lib_readv(substream, bufs, data32.frames); err = snd_pcm_lib_readv(substream, bufs, data32.frames);
break; break;
} }
set_fs(oldseg);
if (err >= 0) { if (err >= 0) {
if (put_user(err, &srcptr->result)) if (put_user(err, &srcptr->result))
err = -EFAULT; err = -EFAULT;
} }
kfree(bufs); kfree(bufs);
return 0;
}
struct sndrv_pcm_hw_params_old32 {
u32 flags;
u32 masks[SNDRV_PCM_HW_PARAM_SUBFORMAT -
SNDRV_PCM_HW_PARAM_ACCESS + 1];
struct sndrv_interval32 intervals[SNDRV_PCM_HW_PARAM_TICK_TIME -
SNDRV_PCM_HW_PARAM_SAMPLE_BITS + 1];
u32 rmask;
u32 cmask;
u32 info;
u32 msbits;
u32 rate_num;
u32 rate_den;
u32 fifo_size;
unsigned char reserved[64];
} __attribute__((packed));
#define __OLD_TO_NEW_MASK(x) ((x&7)|((x&0x07fffff8)<<5))
#define __NEW_TO_OLD_MASK(x) ((x&7)|((x&0xffffff00)>>5))
static void snd_pcm_hw_convert_from_old_params(snd_pcm_hw_params_t *params, struct sndrv_pcm_hw_params_old32 *oparams)
{
unsigned int i;
memset(params, 0, sizeof(*params));
params->flags = oparams->flags;
for (i = 0; i < ARRAY_SIZE(oparams->masks); i++)
params->masks[i].bits[0] = oparams->masks[i];
memcpy(params->intervals, oparams->intervals, sizeof(oparams->intervals));
params->rmask = __OLD_TO_NEW_MASK(oparams->rmask);
params->cmask = __OLD_TO_NEW_MASK(oparams->cmask);
params->info = oparams->info;
params->msbits = oparams->msbits;
params->rate_num = oparams->rate_num;
params->rate_den = oparams->rate_den;
params->fifo_size = oparams->fifo_size;
}
static void snd_pcm_hw_convert_to_old_params(struct sndrv_pcm_hw_params_old32 *oparams, snd_pcm_hw_params_t *params)
{
unsigned int i;
memset(oparams, 0, sizeof(*oparams));
oparams->flags = params->flags;
for (i = 0; i < ARRAY_SIZE(oparams->masks); i++)
oparams->masks[i] = params->masks[i].bits[0];
memcpy(oparams->intervals, params->intervals, sizeof(oparams->intervals));
oparams->rmask = __NEW_TO_OLD_MASK(params->rmask);
oparams->cmask = __NEW_TO_OLD_MASK(params->cmask);
oparams->info = params->info;
oparams->msbits = params->msbits;
oparams->rate_num = params->rate_num;
oparams->rate_den = params->rate_den;
oparams->fifo_size = params->fifo_size;
}
static inline int _snd_ioctl32_pcm_hw_params_old(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file, unsigned int native_ctl)
{
struct sndrv_pcm_hw_params_old32 *data32;
struct sndrv_pcm_hw_params *data;
mm_segment_t oldseg;
int err;
data32 = kcalloc(1, sizeof(*data32), GFP_KERNEL);
data = kcalloc(1, sizeof(*data), GFP_KERNEL);
if (data32 == NULL || data == NULL) {
err = -ENOMEM;
goto __end;
}
if (copy_from_user(data32, (void __user *)arg, sizeof(*data32))) {
err = -EFAULT;
goto __end;
}
snd_pcm_hw_convert_from_old_params(data, data32);
oldseg = get_fs();
set_fs(KERNEL_DS);
err = file->f_op->ioctl(file->f_dentry->d_inode, file, native_ctl, (unsigned long)data);
set_fs(oldseg);
if (err < 0)
goto __end;
snd_pcm_hw_convert_to_old_params(data32, data);
err = 0;
if (copy_to_user((void __user *)arg, data32, sizeof(*data32)))
err = -EFAULT;
else
recalculate_boundary(file);
__end:
if (data)
kfree(data);
if (data32)
kfree(data32);
return err; return err;
} }
struct sndrv_pcm_mmap_status32 { struct sndrv_pcm_mmap_status32 {
s32 state; s32 state;
s32 pad1; s32 pad1;
...@@ -469,15 +356,15 @@ struct sndrv_pcm_sync_ptr32 { ...@@ -469,15 +356,15 @@ struct sndrv_pcm_sync_ptr32 {
COPY(flags);\ COPY(flags);\
COPY(s.status.state);\ COPY(s.status.state);\
COPY(s.status.pad1);\ COPY(s.status.pad1);\
COPY(s.status.hw_ptr);\ COPY_CVT(s.status.hw_ptr);\
COPY(s.status.tstamp.tv_sec);\ COPY_CVT(s.status.tstamp.tv_sec);\
COPY(s.status.tstamp.tv_nsec);\ COPY_CVT(s.status.tstamp.tv_nsec);\
COPY(s.status.suspended_state);\ COPY(s.status.suspended_state);\
COPY(c.control.appl_ptr);\ COPY_CVT(c.control.appl_ptr);\
COPY(c.control.avail_min);\ COPY_CVT(c.control.avail_min);\
} }
DEFINE_ALSA_IOCTL_BIG(pcm_sync_ptr); DEFINE_ALSA_IOCTL(pcm_sync_ptr);
/* /*
*/ */
...@@ -485,8 +372,6 @@ DEFINE_ALSA_IOCTL_BIG(pcm_sync_ptr); ...@@ -485,8 +372,6 @@ DEFINE_ALSA_IOCTL_BIG(pcm_sync_ptr);
DEFINE_ALSA_IOCTL_ENTRY(pcm_hw_refine, pcm_hw_params, SNDRV_PCM_IOCTL_HW_REFINE); DEFINE_ALSA_IOCTL_ENTRY(pcm_hw_refine, pcm_hw_params, SNDRV_PCM_IOCTL_HW_REFINE);
DEFINE_ALSA_IOCTL_ENTRY(pcm_hw_params, pcm_hw_params, SNDRV_PCM_IOCTL_HW_PARAMS); DEFINE_ALSA_IOCTL_ENTRY(pcm_hw_params, pcm_hw_params, SNDRV_PCM_IOCTL_HW_PARAMS);
DEFINE_ALSA_IOCTL_ENTRY(pcm_sw_params, pcm_sw_params, SNDRV_PCM_IOCTL_SW_PARAMS); DEFINE_ALSA_IOCTL_ENTRY(pcm_sw_params, pcm_sw_params, SNDRV_PCM_IOCTL_SW_PARAMS);
DEFINE_ALSA_IOCTL_ENTRY(pcm_hw_refine_old, pcm_hw_params_old, SNDRV_PCM_IOCTL_HW_REFINE);
DEFINE_ALSA_IOCTL_ENTRY(pcm_hw_params_old, pcm_hw_params_old, SNDRV_PCM_IOCTL_HW_PARAMS);
DEFINE_ALSA_IOCTL_ENTRY(pcm_status, pcm_status, SNDRV_PCM_IOCTL_STATUS); DEFINE_ALSA_IOCTL_ENTRY(pcm_status, pcm_status, SNDRV_PCM_IOCTL_STATUS);
DEFINE_ALSA_IOCTL_ENTRY(pcm_delay, pcm_sframes_str, SNDRV_PCM_IOCTL_DELAY); DEFINE_ALSA_IOCTL_ENTRY(pcm_delay, pcm_sframes_str, SNDRV_PCM_IOCTL_DELAY);
DEFINE_ALSA_IOCTL_ENTRY(pcm_channel_info, pcm_channel_info, SNDRV_PCM_IOCTL_CHANNEL_INFO); DEFINE_ALSA_IOCTL_ENTRY(pcm_channel_info, pcm_channel_info, SNDRV_PCM_IOCTL_CHANNEL_INFO);
...@@ -538,8 +423,6 @@ enum { ...@@ -538,8 +423,6 @@ enum {
SNDRV_PCM_IOCTL_READI_FRAMES32 = _IOR('A', 0x51, struct sndrv_xferi32), SNDRV_PCM_IOCTL_READI_FRAMES32 = _IOR('A', 0x51, struct sndrv_xferi32),
SNDRV_PCM_IOCTL_WRITEN_FRAMES32 = _IOW('A', 0x52, struct sndrv_xfern32), SNDRV_PCM_IOCTL_WRITEN_FRAMES32 = _IOW('A', 0x52, struct sndrv_xfern32),
SNDRV_PCM_IOCTL_READN_FRAMES32 = _IOR('A', 0x53, struct sndrv_xfern32), SNDRV_PCM_IOCTL_READN_FRAMES32 = _IOR('A', 0x53, struct sndrv_xfern32),
SNDRV_PCM_IOCTL_HW_REFINE_OLD32 = _IOWR('A', 0x10, struct sndrv_pcm_hw_params_old32),
SNDRV_PCM_IOCTL_HW_PARAMS_OLD32 = _IOWR('A', 0x11, struct sndrv_pcm_hw_params_old32),
SNDRV_PCM_IOCTL_SYNC_PTR32 = _IOWR('A', 0x23, struct sndrv_pcm_sync_ptr32), SNDRV_PCM_IOCTL_SYNC_PTR32 = _IOWR('A', 0x23, struct sndrv_pcm_sync_ptr32),
}; };
...@@ -551,8 +434,6 @@ struct ioctl32_mapper pcm_mappers[] = { ...@@ -551,8 +434,6 @@ struct ioctl32_mapper pcm_mappers[] = {
MAP_COMPAT(SNDRV_PCM_IOCTL_TSTAMP), MAP_COMPAT(SNDRV_PCM_IOCTL_TSTAMP),
{ SNDRV_PCM_IOCTL_HW_REFINE32, AP(pcm_hw_refine) }, { SNDRV_PCM_IOCTL_HW_REFINE32, AP(pcm_hw_refine) },
{ SNDRV_PCM_IOCTL_HW_PARAMS32, AP(pcm_hw_params) }, { SNDRV_PCM_IOCTL_HW_PARAMS32, AP(pcm_hw_params) },
{ SNDRV_PCM_IOCTL_HW_REFINE_OLD32, AP(pcm_hw_refine_old) },
{ SNDRV_PCM_IOCTL_HW_PARAMS_OLD32, AP(pcm_hw_params_old) },
MAP_COMPAT(SNDRV_PCM_IOCTL_HW_FREE), MAP_COMPAT(SNDRV_PCM_IOCTL_HW_FREE),
{ SNDRV_PCM_IOCTL_SW_PARAMS32, AP(pcm_sw_params) }, { SNDRV_PCM_IOCTL_SW_PARAMS32, AP(pcm_sw_params) },
{ SNDRV_PCM_IOCTL_STATUS32, AP(pcm_status) }, { SNDRV_PCM_IOCTL_STATUS32, AP(pcm_status) },
......
sound/core/ioctl32/rawmidi32.c
View file @ 18813ce3
...@@ -38,9 +38,11 @@ struct sndrv_rawmidi_params32 { ...@@ -38,9 +38,11 @@ struct sndrv_rawmidi_params32 {
#define CVT_sndrv_rawmidi_params()\ #define CVT_sndrv_rawmidi_params()\
{\ {\
COPY(stream);\ COPY(stream);\
COPY(buffer_size);\ COPY_CVT(buffer_size);\
COPY(avail_min);\ COPY_CVT(avail_min);\
COPY(no_active_sensing);\ if (copy_in_user(((size_t __user *)&dst->avail_min + 1),\
((size_t __user *)&src->avail_min + 1), 4)) \
return -EFAULT;\
} }
struct sndrv_rawmidi_status32 { struct sndrv_rawmidi_status32 {
...@@ -54,10 +56,10 @@ struct sndrv_rawmidi_status32 { ...@@ -54,10 +56,10 @@ struct sndrv_rawmidi_status32 {
#define CVT_sndrv_rawmidi_status()\ #define CVT_sndrv_rawmidi_status()\
{\ {\
COPY(stream);\ COPY(stream);\
COPY(tstamp.tv_sec);\ COPY_CVT(tstamp.tv_sec);\
COPY(tstamp.tv_nsec);\ COPY_CVT(tstamp.tv_nsec);\
COPY(avail);\ COPY_CVT(avail);\
COPY(xruns);\ COPY_CVT(xruns);\
} }
DEFINE_ALSA_IOCTL(rawmidi_params); DEFINE_ALSA_IOCTL(rawmidi_params);
......
sound/core/ioctl32/seq32.c
View file @ 18813ce3
...@@ -42,13 +42,14 @@ struct sndrv_seq_port_info32 { ...@@ -42,13 +42,14 @@ struct sndrv_seq_port_info32 {
u32 kernel; /* reserved for kernel use (must be NULL) */ u32 kernel; /* reserved for kernel use (must be NULL) */
u32 flags; /* misc. conditioning */ u32 flags; /* misc. conditioning */
char reserved[60]; /* for future use */ unsigned char time_queue; /* queue # for timestamping */
char reserved[59]; /* for future use */
}; };
#define CVT_sndrv_seq_port_info()\ #define CVT_sndrv_seq_port_info()\
{\ {\
COPY(addr);\ COPY(addr);\
memcpy(dst->name, src->name, sizeof(dst->name));\ COPY_ARRAY(name);\
COPY(capability);\ COPY(capability);\
COPY(type);\ COPY(type);\
COPY(midi_channels);\ COPY(midi_channels);\
...@@ -57,6 +58,7 @@ struct sndrv_seq_port_info32 { ...@@ -57,6 +58,7 @@ struct sndrv_seq_port_info32 {
COPY(read_use);\ COPY(read_use);\
COPY(write_use);\ COPY(write_use);\
COPY(flags);\ COPY(flags);\
COPY(time_queue);\
} }
DEFINE_ALSA_IOCTL(seq_port_info); DEFINE_ALSA_IOCTL(seq_port_info);
......
sound/core/ioctl32/timer32.c
View file @ 18813ce3
...@@ -41,9 +41,9 @@ struct sndrv_timer_info32 { ...@@ -41,9 +41,9 @@ struct sndrv_timer_info32 {
{\ {\
COPY(flags);\ COPY(flags);\
COPY(card);\ COPY(card);\
memcpy(dst->id, src->id, sizeof(src->id));\ COPY_ARRAY(id);\
memcpy(dst->name, src->name, sizeof(src->name));\ COPY_ARRAY(name);\
COPY(resolution);\ COPY_CVT(resolution);\
} }
struct sndrv_timer_status32 { struct sndrv_timer_status32 {
...@@ -57,8 +57,8 @@ struct sndrv_timer_status32 { ...@@ -57,8 +57,8 @@ struct sndrv_timer_status32 {
#define CVT_sndrv_timer_status()\ #define CVT_sndrv_timer_status()\
{\ {\
COPY(tstamp.tv_sec);\ COPY_CVT(tstamp.tv_sec);\
COPY(tstamp.tv_nsec);\ COPY_CVT(tstamp.tv_nsec);\
COPY(resolution);\ COPY(resolution);\
COPY(lost);\ COPY(lost);\
COPY(overrun);\ COPY(overrun);\
......
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