Skip to content

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

Fix up sound driver proc-reading interfaces. 

The old ones were not only hard to use, they were in fact
impossible or a low-level sound driver to get right, since
the core sound code didn't even export all the necessary
information.

Add the file offset to the /proc read interfaces, and make
them simpler to use. The core now does a offset updates, and
sanity-checks the values so that the low-level drivers don't
need to worry.
parent 4b3aac8d
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 71 deletions
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
View file @ 7551961b
...@@ -5182,7 +5182,7 @@ struct _snd_pcm_runtime { ...@@ -5182,7 +5182,7 @@ struct _snd_pcm_runtime {
The callback is much more complicated than the text-file The callback is much more complicated than the text-file
version. You need to use a low-level i/o functions such as version. You need to use a low-level i/o functions such as
<function>copy_from/to_user()</function> to transfer the <function>copy_from/to_user()</function> to transfer the
data. Also, you have to keep tracking the file position, too. data.
<informalexample> <informalexample>
<programlisting> <programlisting>
...@@ -5190,14 +5190,15 @@ struct _snd_pcm_runtime { ...@@ -5190,14 +5190,15 @@ struct _snd_pcm_runtime {
static long my_file_io_read(snd_info_entry_t *entry, static long my_file_io_read(snd_info_entry_t *entry,
void *file_private_data, void *file_private_data,
struct file *file, struct file *file,
char *buf, long count) char *buf,
unsigned long count,
unsigned long pos)
{ {
long size = count; long size = count;
if (file->f_pos + size > local_max_size) if (pos + size > local_max_size)
size = local_max_size - file->f_pos; size = local_max_size - pos;
if (copy_to_user(buf, local_data + file->f_pos, size)) if (copy_to_user(buf, local_data + pos, size))
return -EFAULT; return -EFAULT;
file->f_pos += size;
return size; return size;
} }
]]> ]]>
......
include/sound/info.h
View file @ 7551961b
...@@ -54,9 +54,11 @@ struct snd_info_entry_ops { ...@@ -54,9 +54,11 @@ struct snd_info_entry_ops {
int (*release) (snd_info_entry_t * entry, int (*release) (snd_info_entry_t * entry,
unsigned short mode, void *file_private_data); unsigned short mode, void *file_private_data);
long (*read) (snd_info_entry_t *entry, void *file_private_data, long (*read) (snd_info_entry_t *entry, void *file_private_data,
struct file * file, char __user *buf, long count); struct file * file, char __user *buf,
unsigned long count, unsigned long pos);
long (*write) (snd_info_entry_t *entry, void *file_private_data, long (*write) (snd_info_entry_t *entry, void *file_private_data,
struct file * file, const char __user *buf, long count); struct file * file, const char __user *buf,
unsigned long count, unsigned long pos);
long long (*llseek) (snd_info_entry_t *entry, void *file_private_data, long long (*llseek) (snd_info_entry_t *entry, void *file_private_data,
struct file * file, long long offset, int orig); struct file * file, long long offset, int orig);
unsigned int (*poll) (snd_info_entry_t *entry, void *file_private_data, unsigned int (*poll) (snd_info_entry_t *entry, void *file_private_data,
......
sound/core/info.c
View file @ 7551961b
...@@ -181,30 +181,37 @@ static ssize_t snd_info_entry_read(struct file *file, char __user *buffer, ...@@ -181,30 +181,37 @@ static ssize_t snd_info_entry_read(struct file *file, char __user *buffer,
struct snd_info_entry *entry; struct snd_info_entry *entry;
snd_info_buffer_t *buf; snd_info_buffer_t *buf;
size_t size = 0; size_t size = 0;
loff_t pos;
data = snd_magic_cast(snd_info_private_data_t, file->private_data, return -ENXIO); data = snd_magic_cast(snd_info_private_data_t, file->private_data, return -ENXIO);
snd_assert(data != NULL, return -ENXIO); snd_assert(data != NULL, return -ENXIO);
pos = *offset;
if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
return -EIO;
if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
return -EIO;
entry = data->entry; entry = data->entry;
switch (entry->content) { switch (entry->content) {
case SNDRV_INFO_CONTENT_TEXT: case SNDRV_INFO_CONTENT_TEXT:
buf = data->rbuffer; buf = data->rbuffer;
if (buf == NULL) if (buf == NULL)
return -EIO; return -EIO;
if (file->f_pos >= (long)buf->size) if (pos >= buf->size)
return 0; return 0;
size = buf->size - file->f_pos; size = buf->size - pos;
size = min(count, size); size = min(count, size);
if (copy_to_user(buffer, buf->buffer + file->f_pos, size)) if (copy_to_user(buffer, buf->buffer + pos, size))
return -EFAULT; return -EFAULT;
file->f_pos += size;
break; break;
case SNDRV_INFO_CONTENT_DATA: case SNDRV_INFO_CONTENT_DATA:
if (entry->c.ops->read) if (entry->c.ops->read)
return entry->c.ops->read(entry, size = entry->c.ops->read(entry,
data->file_private_data, data->file_private_data,
file, buffer, count); file, buffer, count, pos);
break; break;
} }
if ((ssize_t) size > 0)
*offset = pos + size;
return size; return size;
} }
...@@ -215,34 +222,39 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer ...@@ -215,34 +222,39 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer
struct snd_info_entry *entry; struct snd_info_entry *entry;
snd_info_buffer_t *buf; snd_info_buffer_t *buf;
size_t size = 0; size_t size = 0;
loff_t pos;
data = snd_magic_cast(snd_info_private_data_t, file->private_data, return -ENXIO); data = snd_magic_cast(snd_info_private_data_t, file->private_data, return -ENXIO);
snd_assert(data != NULL, return -ENXIO); snd_assert(data != NULL, return -ENXIO);
entry = data->entry; entry = data->entry;
pos = *offset;
if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
return -EIO;
if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
return -EIO;
switch (entry->content) { switch (entry->content) {
case SNDRV_INFO_CONTENT_TEXT: case SNDRV_INFO_CONTENT_TEXT:
buf = data->wbuffer; buf = data->wbuffer;
if (buf == NULL) if (buf == NULL)
return -EIO; return -EIO;
if (file->f_pos < 0) if (pos >= buf->len)
return -EINVAL;
if (file->f_pos >= (long)buf->len)
return -ENOMEM; return -ENOMEM;
size = buf->len - file->f_pos; size = buf->len - pos;
size = min(count, size); size = min(count, size);
if (copy_from_user(buf->buffer + file->f_pos, buffer, size)) if (copy_from_user(buf->buffer + pos, buffer, size))
return -EFAULT; return -EFAULT;
if ((long)buf->size < file->f_pos + size) if ((long)buf->size < pos + size)
buf->size = file->f_pos + size; buf->size = pos + size;
file->f_pos += size;
break; break;
case SNDRV_INFO_CONTENT_DATA: case SNDRV_INFO_CONTENT_DATA:
if (entry->c.ops->write) if (entry->c.ops->write)
return entry->c.ops->write(entry, size = entry->c.ops->write(entry,
data->file_private_data, data->file_private_data,
file, buffer, count); file, buffer, count, pos);
break; break;
} }
if ((ssize_t) size > 0)
*offset = pos + size;
return size; return size;
} }
......
sound/drivers/opl4/opl4_proc.c
View file @ 7551961b
...@@ -50,41 +50,42 @@ static int snd_opl4_mem_proc_release(snd_info_entry_t *entry, ...@@ -50,41 +50,42 @@ static int snd_opl4_mem_proc_release(snd_info_entry_t *entry,
} }
static long snd_opl4_mem_proc_read(snd_info_entry_t *entry, void *file_private_data, static long snd_opl4_mem_proc_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *_buf, long count) struct file *file, char __user *_buf,
unsigned long count, unsigned long pos)
{ {
opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO); opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO);
long size; long size;
char* buf; char* buf;
size = count; size = count;
if (file->f_pos + size > entry->size) if (pos + size > entry->size)
size = entry->size - file->f_pos; size = entry->size - pos;
if (size > 0) { if (size > 0) {
buf = vmalloc(size); buf = vmalloc(size);
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
snd_opl4_read_memory(opl4, buf, file->f_pos, size); snd_opl4_read_memory(opl4, buf, pos, size);
if (copy_to_user(_buf, buf, size)) { if (copy_to_user(_buf, buf, size)) {
vfree(buf); vfree(buf);
return -EFAULT; return -EFAULT;
} }
vfree(buf); vfree(buf);
file->f_pos += size;
return size; return size;
} }
return 0; return 0;
} }
static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_data, static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_data,
struct file *file, const char __user *_buf, long count) struct file *file, const char __user *_buf,
unsigned long count, unsigned long pos)
{ {
opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO); opl4_t *opl4 = snd_magic_cast(opl4_t, entry->private_data, return -ENXIO);
long size; long size;
char *buf; char *buf;
size = count; size = count;
if (file->f_pos + size > entry->size) if (pos + size > entry->size)
size = entry->size - file->f_pos; size = entry->size - pos;
if (size > 0) { if (size > 0) {
buf = vmalloc(size); buf = vmalloc(size);
if (!buf) if (!buf)
...@@ -93,9 +94,8 @@ static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_ ...@@ -93,9 +94,8 @@ static long snd_opl4_mem_proc_write(snd_info_entry_t *entry, void *file_private_
vfree(buf); vfree(buf);
return -EFAULT; return -EFAULT;
} }
snd_opl4_write_memory(opl4, buf, file->f_pos, size); snd_opl4_write_memory(opl4, buf, pos, size);
vfree(buf); vfree(buf);
file->f_pos += size;
return size; return size;
} }
return 0; return 0;
......
sound/isa/gus/gus_mem_proc.c
View file @ 7551961b
...@@ -33,7 +33,8 @@ typedef struct gus_proc_private { ...@@ -33,7 +33,8 @@ typedef struct gus_proc_private {
} gus_proc_private_t; } gus_proc_private_t;
static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_data, static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
long size; long size;
gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO); gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO);
...@@ -41,12 +42,11 @@ static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_da ...@@ -41,12 +42,11 @@ static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_da
int err; int err;
size = count; size = count;
if (file->f_pos + size > priv->size) if (pos + size > priv->size)
size = (long)priv->size - file->f_pos; size = (long)priv->size - pos;
if (size > 0) { if (size > 0) {
if ((err = snd_gus_dram_read(gus, buf, file->f_pos, size, priv->rom)) < 0) if ((err = snd_gus_dram_read(gus, buf, pos, size, priv->rom)) < 0)
return err; return err;
file->f_pos += size;
return size; return size;
} }
return 0; return 0;
......
sound/pci/cs4281.c
View file @ 7551961b
...@@ -1185,35 +1185,35 @@ static void snd_cs4281_proc_read(snd_info_entry_t *entry, ...@@ -1185,35 +1185,35 @@ static void snd_cs4281_proc_read(snd_info_entry_t *entry,
} }
static long snd_cs4281_BA0_read(snd_info_entry_t *entry, void *file_private_data, static long snd_cs4281_BA0_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
long size; long size;
cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO); cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO);
size = count; size = count;
if (file->f_pos + size > CS4281_BA0_SIZE) if (pos + size > CS4281_BA0_SIZE)
size = (long)CS4281_BA0_SIZE - file->f_pos; size = (long)CS4281_BA0_SIZE - pos;
if (size > 0) { if (size > 0) {
if (copy_to_user_fromio(buf, chip->ba0 + file->f_pos, size)) if (copy_to_user_fromio(buf, chip->ba0 + pos, size))
return -EFAULT; return -EFAULT;
file->f_pos += size;
} }
return size; return size;
} }
static long snd_cs4281_BA1_read(snd_info_entry_t *entry, void *file_private_data, static long snd_cs4281_BA1_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
long size; long size;
cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO); cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO);
size = count; size = count;
if (file->f_pos + size > CS4281_BA1_SIZE) if (pos + size > CS4281_BA1_SIZE)
size = (long)CS4281_BA1_SIZE - file->f_pos; size = (long)CS4281_BA1_SIZE - pos;
if (size > 0) { if (size > 0) {
if (copy_to_user_fromio(buf, chip->ba1 + file->f_pos, size)) if (copy_to_user_fromio(buf, chip->ba1 + pos, size))
return -EFAULT; return -EFAULT;
file->f_pos += size;
} }
return size; return size;
} }
......
sound/pci/cs46xx/cs46xx_lib.c
View file @ 7551961b
...@@ -2866,18 +2866,18 @@ void __devinit snd_cs46xx_gameport(cs46xx_t *chip) ...@@ -2866,18 +2866,18 @@ void __devinit snd_cs46xx_gameport(cs46xx_t *chip)
*/ */
static long snd_cs46xx_io_read(snd_info_entry_t *entry, void *file_private_data, static long snd_cs46xx_io_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
long size; long size;
snd_cs46xx_region_t *region = (snd_cs46xx_region_t *)entry->private_data; snd_cs46xx_region_t *region = (snd_cs46xx_region_t *)entry->private_data;
size = count; size = count;
if (file->f_pos + (size_t)size > region->size) if (pos + (size_t)size > region->size)
size = region->size - file->f_pos; size = region->size - pos;
if (size > 0) { if (size > 0) {
if (copy_to_user_fromio(buf, region->remap_addr + file->f_pos, size)) if (copy_to_user_fromio(buf, region->remap_addr + pos, size))
return -EFAULT; return -EFAULT;
file->f_pos += size;
} }
return size; return size;
} }
......
sound/pci/emu10k1/emuproc.c
View file @ 7551961b
...@@ -191,7 +191,8 @@ static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry, ...@@ -191,7 +191,8 @@ static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry,
#define TOTAL_SIZE_CODE (0x200*8) #define TOTAL_SIZE_CODE (0x200*8)
static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_data, static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
long size; long size;
emu10k1_t *emu = snd_magic_cast(emu10k1_t, entry->private_data, return -ENXIO); emu10k1_t *emu = snd_magic_cast(emu10k1_t, entry->private_data, return -ENXIO);
...@@ -209,21 +210,20 @@ static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_ ...@@ -209,21 +210,20 @@ static long snd_emu10k1_fx8010_read(snd_info_entry_t *entry, void *file_private_
offset = emu->audigy ? A_FXGPREGBASE : FXGPREGBASE; offset = emu->audigy ? A_FXGPREGBASE : FXGPREGBASE;
} }
size = count; size = count;
if (file->f_pos + size > entry->size) if (pos + size > entry->size)
size = (long)entry->size - file->f_pos; size = (long)entry->size - pos;
if (size > 0) { if (size > 0) {
unsigned int *tmp; unsigned int *tmp;
long res; long res;
unsigned int idx; unsigned int idx;
if ((tmp = kmalloc(size + 8, GFP_KERNEL)) == NULL) if ((tmp = kmalloc(size + 8, GFP_KERNEL)) == NULL)
return -ENOMEM; return -ENOMEM;
for (idx = 0; idx < ((file->f_pos & 3) + size + 3) >> 2; idx++) for (idx = 0; idx < ((pos & 3) + size + 3) >> 2; idx++)
tmp[idx] = snd_emu10k1_ptr_read(emu, offset + idx + (file->f_pos >> 2), 0); tmp[idx] = snd_emu10k1_ptr_read(emu, offset + idx + (pos >> 2), 0);
if (copy_to_user(buf, ((char *)tmp) + (file->f_pos & 3), size)) if (copy_to_user(buf, ((char *)tmp) + (pos & 3), size))
res = -EFAULT; res = -EFAULT;
else { else {
res = size; res = size;
file->f_pos += size;
} }
kfree(tmp); kfree(tmp);
return res; return res;
......
sound/pci/mixart/mixart.c
View file @ 7551961b
...@@ -1154,18 +1154,18 @@ static long long snd_mixart_BA1_llseek(snd_info_entry_t *entry, ...@@ -1154,18 +1154,18 @@ static long long snd_mixart_BA1_llseek(snd_info_entry_t *entry,
mixart_BA0 proc interface for BAR 0 - read callback mixart_BA0 proc interface for BAR 0 - read callback
*/ */
static long snd_mixart_BA0_read(snd_info_entry_t *entry, void *file_private_data, static long snd_mixart_BA0_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, entry->private_data, return -ENXIO); mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, entry->private_data, return -ENXIO);
count = count & ~3; /* make sure the read size is a multiple of 4 bytes */ count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
if(count <= 0) if(count <= 0)
return 0; return 0;
if(file->f_pos + count > MIXART_BA0_SIZE) if(pos + count > MIXART_BA0_SIZE)
count = (long)(MIXART_BA0_SIZE - file->f_pos); count = (long)(MIXART_BA0_SIZE - pos);
if(copy_to_user_fromio(buf, MIXART_MEM( mgr, file->f_pos ), count)) if(copy_to_user_fromio(buf, MIXART_MEM( mgr, pos ), count))
return -EFAULT; return -EFAULT;
file->f_pos += count;
return count; return count;
} }
...@@ -1173,18 +1173,18 @@ static long snd_mixart_BA0_read(snd_info_entry_t *entry, void *file_private_data ...@@ -1173,18 +1173,18 @@ static long snd_mixart_BA0_read(snd_info_entry_t *entry, void *file_private_data
mixart_BA1 proc interface for BAR 1 - read callback mixart_BA1 proc interface for BAR 1 - read callback
*/ */
static long snd_mixart_BA1_read(snd_info_entry_t *entry, void *file_private_data, static long snd_mixart_BA1_read(snd_info_entry_t *entry, void *file_private_data,
struct file *file, char __user *buf, long count) struct file *file, char __user *buf,
unsigned long count, unsigned long pos)
{ {
mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, entry->private_data, return -ENXIO); mixart_mgr_t *mgr = snd_magic_cast(mixart_mgr_t, entry->private_data, return -ENXIO);
count = count & ~3; /* make sure the read size is a multiple of 4 bytes */ count = count & ~3; /* make sure the read size is a multiple of 4 bytes */
if(count <= 0) if(count <= 0)
return 0; return 0;
if(file->f_pos + count > MIXART_BA1_SIZE) if(pos + count > MIXART_BA1_SIZE)
count = (long)(MIXART_BA1_SIZE - file->f_pos); count = (long)(MIXART_BA1_SIZE - pos);
if(copy_to_user_fromio(buf, MIXART_REG( mgr, file->f_pos ), count)) if(copy_to_user_fromio(buf, MIXART_REG( mgr, pos ), count))
return -EFAULT; return -EFAULT;
file->f_pos += count;
return count; return count;
} }
......
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