mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
ALSA: info - Check file position validity in common layer
Check the validity of the file position in the common info layer before calling read or write callbacks in assumption that entry->size is set up properly to indicate the max file size. Removed the redundant checks from the callbacks as well. Signed-off-by: Takashi Iwai <[email protected]>
This commit is contained in:
parent
24e4a1211f
commit
d97e1b7823
7 changed files with 60 additions and 105 deletions
|
|
@ -36,20 +36,14 @@ static ssize_t snd_gf1_mem_proc_dump(struct snd_info_entry *entry,
|
|||
struct file *file, char __user *buf,
|
||||
size_t count, loff_t pos)
|
||||
{
|
||||
long size;
|
||||
struct gus_proc_private *priv = entry->private_data;
|
||||
struct snd_gus_card *gus = priv->gus;
|
||||
int err;
|
||||
|
||||
size = count;
|
||||
if (pos + size > priv->size)
|
||||
size = (long)priv->size - pos;
|
||||
if (size > 0) {
|
||||
if ((err = snd_gus_dram_read(gus, buf, pos, size, priv->rom)) < 0)
|
||||
return err;
|
||||
return size;
|
||||
}
|
||||
return 0;
|
||||
err = snd_gus_dram_read(gus, buf, pos, count, priv->rom);
|
||||
if (err < 0)
|
||||
return err;
|
||||
return count;
|
||||
}
|
||||
|
||||
static loff_t snd_gf1_mem_proc_llseek(struct snd_info_entry *entry,
|
||||
|
|
|
|||
Loading…
Reference in a new issue