Skip to content

L
linux
Commit 68089abc authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files
Options

ALSA update 

  - reduced stack usage for functions using >1024+ bytes
  - fixed behaviour when OSS emulation is selected
  - fix in kmod support for sequencer
parent 8086afae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 86 deletions
sound/core/control.c
View file @ 68089abc
...@@ -426,25 +426,28 @@ static int snd_ctl_elem_info(snd_ctl_file_t *ctl, snd_ctl_elem_info_t *_info) ...@@ -426,25 +426,28 @@ static int snd_ctl_elem_info(snd_ctl_file_t *ctl, snd_ctl_elem_info_t *_info)
static int snd_ctl_elem_read(snd_card_t *card, snd_ctl_elem_value_t *_control) static int snd_ctl_elem_read(snd_card_t *card, snd_ctl_elem_value_t *_control)
{ {
snd_ctl_elem_value_t control; snd_ctl_elem_value_t *control;
snd_kcontrol_t *kctl; snd_kcontrol_t *kctl;
int result, indirect; int result, indirect;
if (copy_from_user(&control, _control, sizeof(control))) control = kmalloc(sizeof(*control), GFP_KERNEL);
if (control == NULL)
return -ENOMEM;
if (copy_from_user(control, _control, sizeof(*control)))
return -EFAULT; return -EFAULT;
read_lock(&card->control_rwlock); read_lock(&card->control_rwlock);
kctl = snd_ctl_find_id(card, &control.id); kctl = snd_ctl_find_id(card, &control->id);
if (kctl == NULL) { if (kctl == NULL) {
result = -ENOENT; result = -ENOENT;
} else { } else {
indirect = kctl->access & SNDRV_CTL_ELEM_ACCESS_INDIRECT ? 1 : 0; indirect = kctl->access & SNDRV_CTL_ELEM_ACCESS_INDIRECT ? 1 : 0;
if (control.indirect != indirect) { if (control->indirect != indirect) {
result = -EACCES; result = -EACCES;
} else { } else {
if ((kctl->access & SNDRV_CTL_ELEM_ACCESS_READ) && kctl->get != NULL) { if ((kctl->access & SNDRV_CTL_ELEM_ACCESS_READ) && kctl->get != NULL) {
result = kctl->get(kctl, &control); result = kctl->get(kctl, control);
if (result >= 0) if (result >= 0)
control.id = kctl->id; control->id = kctl->id;
} else } else
result = -EPERM; result = -EPERM;
} }
...@@ -453,25 +456,29 @@ static int snd_ctl_elem_read(snd_card_t *card, snd_ctl_elem_value_t *_control) ...@@ -453,25 +456,29 @@ static int snd_ctl_elem_read(snd_card_t *card, snd_ctl_elem_value_t *_control)
if (result >= 0) if (result >= 0)
if (copy_to_user(_control, &control, sizeof(control))) if (copy_to_user(_control, &control, sizeof(control)))
return -EFAULT; return -EFAULT;
kfree(control);
return result; return result;
} }
static int snd_ctl_elem_write(snd_ctl_file_t *file, snd_ctl_elem_value_t *_control) static int snd_ctl_elem_write(snd_ctl_file_t *file, snd_ctl_elem_value_t *_control)
{ {
snd_card_t *card = file->card; snd_card_t *card = file->card;
snd_ctl_elem_value_t control; snd_ctl_elem_value_t *control;
snd_kcontrol_t *kctl; snd_kcontrol_t *kctl;
int result, indirect; int result, indirect;
if (copy_from_user(&control, _control, sizeof(control))) control = kmalloc(sizeof(*control), GFP_KERNEL);
if (control == NULL)
return -ENOMEM;
if (copy_from_user(control, _control, sizeof(*control)))
return -EFAULT; return -EFAULT;
read_lock(&card->control_rwlock); read_lock(&card->control_rwlock);
kctl = snd_ctl_find_id(card, &control.id); kctl = snd_ctl_find_id(card, &control->id);
if (kctl == NULL) { if (kctl == NULL) {
result = -ENOENT; result = -ENOENT;
} else { } else {
indirect = kctl->access & SNDRV_CTL_ELEM_ACCESS_INDIRECT ? 1 : 0; indirect = kctl->access & SNDRV_CTL_ELEM_ACCESS_INDIRECT ? 1 : 0;
if (control.indirect != indirect) { if (control->indirect != indirect) {
result = -EACCES; result = -EACCES;
} else { } else {
read_lock(&card->control_owner_lock); read_lock(&card->control_owner_lock);
...@@ -480,9 +487,9 @@ static int snd_ctl_elem_write(snd_ctl_file_t *file, snd_ctl_elem_value_t *_contr ...@@ -480,9 +487,9 @@ static int snd_ctl_elem_write(snd_ctl_file_t *file, snd_ctl_elem_value_t *_contr
(kctl->owner != NULL && kctl->owner != file)) { (kctl->owner != NULL && kctl->owner != file)) {
result = -EPERM; result = -EPERM;
} else { } else {
result = kctl->put(kctl, &control); result = kctl->put(kctl, control);
if (result >= 0) if (result >= 0)
control.id = kctl->id; control->id = kctl->id;
} }
read_unlock(&card->control_owner_lock); read_unlock(&card->control_owner_lock);
if (result > 0) { if (result > 0) {
...@@ -498,6 +505,7 @@ static int snd_ctl_elem_write(snd_ctl_file_t *file, snd_ctl_elem_value_t *_contr ...@@ -498,6 +505,7 @@ static int snd_ctl_elem_write(snd_ctl_file_t *file, snd_ctl_elem_value_t *_contr
if (result >= 0) if (result >= 0)
if (copy_to_user(_control, &control, sizeof(control))) if (copy_to_user(_control, &control, sizeof(control)))
return -EFAULT; return -EFAULT;
kfree(control);
return result; return result;
} }
......
sound/core/hwdep.c
View file @ 68089abc
...@@ -327,7 +327,7 @@ static int snd_hwdep_dev_register(snd_device_t *device) ...@@ -327,7 +327,7 @@ static int snd_hwdep_dev_register(snd_device_t *device)
up(&register_mutex); up(&register_mutex);
return err; return err;
} }
#ifdef SNDRV_OSS_INFO_DEV_AUDIO #ifdef CONFIG_SND_OSSEMUL
hwdep->ossreg = 0; hwdep->ossreg = 0;
if (hwdep->oss_type >= 0) { if (hwdep->oss_type >= 0) {
if ((hwdep->oss_type == SNDRV_OSS_DEVICE_TYPE_DMFM) && (hwdep->device != 0)) { if ((hwdep->oss_type == SNDRV_OSS_DEVICE_TYPE_DMFM) && (hwdep->device != 0)) {
...@@ -359,7 +359,7 @@ static int snd_hwdep_dev_unregister(snd_device_t *device) ...@@ -359,7 +359,7 @@ static int snd_hwdep_dev_unregister(snd_device_t *device)
up(&register_mutex); up(&register_mutex);
return -EINVAL; return -EINVAL;
} }
#ifdef SNDRV_OSS_INFO_DEV_AUDIO #ifdef CONFIG_SND_OSSEMUL
if (hwdep->ossreg) if (hwdep->ossreg)
snd_unregister_oss_device(hwdep->oss_type, hwdep->card, hwdep->device); snd_unregister_oss_device(hwdep->oss_type, hwdep->card, hwdep->device);
#endif #endif
......
sound/core/memory.c
View file @ 68089abc
...@@ -499,10 +499,10 @@ char *snd_kmalloc_strdup(const char *string, int flags) ...@@ -499,10 +499,10 @@ char *snd_kmalloc_strdup(const char *string, int flags)
int copy_to_user_fromio(void *dst, unsigned long src, size_t count) int copy_to_user_fromio(void *dst, unsigned long src, size_t count)
{ {
#if defined(__i386_) || defined(CONFIG_SPARC32) #if defined(__i386__) || defined(CONFIG_SPARC32)
return copy_to_user(dst, (const void*)src, count) ? -EFAULT : 0; return copy_to_user(dst, (const void*)src, count) ? -EFAULT : 0;
#else #else
char buf[1024]; char buf[256];
while (count) { while (count) {
size_t c = count; size_t c = count;
if (c > sizeof(buf)) if (c > sizeof(buf))
...@@ -520,10 +520,10 @@ int copy_to_user_fromio(void *dst, unsigned long src, size_t count) ...@@ -520,10 +520,10 @@ int copy_to_user_fromio(void *dst, unsigned long src, size_t count)
int copy_from_user_toio(unsigned long dst, const void *src, size_t count) int copy_from_user_toio(unsigned long dst, const void *src, size_t count)
{ {
#if defined(__i386_) || defined(CONFIG_SPARC32) #if defined(__i386__) || defined(CONFIG_SPARC32)
return copy_from_user((void*)dst, src, count) ? -EFAULT : 0; return copy_from_user((void*)dst, src, count) ? -EFAULT : 0;
#else #else
char buf[1024]; char buf[256];
while (count) { while (count) {
size_t c = count; size_t c = count;
if (c > sizeof(buf)) if (c > sizeof(buf))
......
sound/core/oss/mixer_oss.c
View file @ 68089abc
This diff is collapsed.
sound/core/rawmidi.c
View file @ 68089abc
...@@ -1417,7 +1417,7 @@ static int snd_rawmidi_dev_register(snd_device_t *device) ...@@ -1417,7 +1417,7 @@ static int snd_rawmidi_dev_register(snd_device_t *device)
up(&register_mutex); up(&register_mutex);
return err; return err;
} }
#ifdef SNDRV_OSS_INFO_DEV_AUDIO #ifdef CONFIG_SND_OSSEMUL
rmidi->ossreg = 0; rmidi->ossreg = 0;
if (rmidi->device == snd_midi_map[rmidi->card->number]) { if (rmidi->device == snd_midi_map[rmidi->card->number]) {
if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
...@@ -1425,7 +1425,9 @@ static int snd_rawmidi_dev_register(snd_device_t *device) ...@@ -1425,7 +1425,9 @@ static int snd_rawmidi_dev_register(snd_device_t *device)
snd_printk(KERN_ERR "unable to register OSS rawmidi device %i:%i\n", rmidi->card->number, 0); snd_printk(KERN_ERR "unable to register OSS rawmidi device %i:%i\n", rmidi->card->number, 0);
} else { } else {
rmidi->ossreg++; rmidi->ossreg++;
#ifdef SNDRV_OSS_INFO_DEV_MIDI
snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIDI, rmidi->card->number, rmidi->name); snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIDI, rmidi->card->number, rmidi->name);
#endif
} }
} }
if (rmidi->device == snd_amidi_map[rmidi->card->number]) { if (rmidi->device == snd_amidi_map[rmidi->card->number]) {
...@@ -1436,7 +1438,7 @@ static int snd_rawmidi_dev_register(snd_device_t *device) ...@@ -1436,7 +1438,7 @@ static int snd_rawmidi_dev_register(snd_device_t *device)
rmidi->ossreg++; rmidi->ossreg++;
} }
} }
#endif #endif /* CONFIG_SND_OSSEMUL */
up(&register_mutex); up(&register_mutex);
sprintf(name, "midi%d", rmidi->device); sprintf(name, "midi%d", rmidi->device);
entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root); entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root);
...@@ -1480,17 +1482,19 @@ static int snd_rawmidi_dev_unregister(snd_device_t *device) ...@@ -1480,17 +1482,19 @@ static int snd_rawmidi_dev_unregister(snd_device_t *device)
snd_info_unregister(rmidi->proc_entry); snd_info_unregister(rmidi->proc_entry);
rmidi->proc_entry = NULL; rmidi->proc_entry = NULL;
} }
#ifdef SNDRV_OSS_INFO_DEV_AUDIO #ifdef CONFIG_SND_OSSEMUL
if (rmidi->ossreg) { if (rmidi->ossreg) {
if (rmidi->device == snd_midi_map[rmidi->card->number]) { if (rmidi->device == snd_midi_map[rmidi->card->number]) {
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, rmidi->card, 0); snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, rmidi->card, 0);
#ifdef SNDRV_OSS_INFO_DEV_MIDI
snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_MIDI, rmidi->card->number); snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_MIDI, rmidi->card->number);
#endif
} }
if (rmidi->device == snd_amidi_map[rmidi->card->number]) if (rmidi->device == snd_amidi_map[rmidi->card->number])
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, rmidi->card, 1); snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, rmidi->card, 1);
rmidi->ossreg = 0; rmidi->ossreg = 0;
} }
#endif #endif /* CONFIG_SND_OSSEMUL */
if (rmidi->ops && rmidi->ops->dev_unregister) if (rmidi->ops && rmidi->ops->dev_unregister)
rmidi->ops->dev_unregister(rmidi); rmidi->ops->dev_unregister(rmidi);
snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device); snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device);
......
sound/core/seq/seq_clientmgr.c
View file @ 68089abc
...@@ -152,9 +152,11 @@ client_t *snd_seq_client_use_ptr(int clientid) ...@@ -152,9 +152,11 @@ client_t *snd_seq_client_use_ptr(int clientid)
} }
} else if (clientid >= 64 && clientid < 128) { } else if (clientid >= 64 && clientid < 128) {
int card = (clientid - 64) / 8; int card = (clientid - 64) / 8;
if (card < snd_ecards_limit && ! card_requested[card]) { if (card < snd_ecards_limit) {
card_requested[card] = 1; if (! card_requested[card]) {
snd_request_card(card); card_requested[card] = 1;
snd_request_card(card);
}
snd_seq_device_load_drivers(); snd_seq_device_load_drivers();
} }
} }
......
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