Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 067c2f47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "We've got quite a few fixes at this time, and all are stable patches.

  syzkaller strikes back again (episode 19 or so), and we had to plug
  some holes in ALSA core part (mostly timer).

  In addition, a couple of FireWire audio fixes for the invalid copy
  user calls in locks, and a few quirks for HD-audio and USB-audio as
  usual are included"

* tag 'sound-4.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: rawmidi: Fix possible deadlock with virmidi registration
  ALSA: timer: Fix zero-division by continue of uninitialized instance
  ALSA: timer: fix NULL pointer dereference in read()/ioctl() race
  ALSA: fireworks: accessing to user space outside spinlock
  ALSA: firewire-tascam: accessing to user space outside spinlock
  ALSA: hda - Enable subwoofer on Dell Inspiron 7559
  ALSA: hda - Add headset mic quirk for Dell Inspiron 5468
  ALSA: usb-audio: Add sample rate inquiry quirk for B850V3 CP2114
  ALSA: timer: fix NULL pointer dereference on memory allocation failure
  ALSA: timer: fix division by zero after SNDRV_TIMER_IOCTL_CONTINUE
parents e45eeb43 816f318b

sound/core/rawmidi.c

+3 −1
Original line number Diff line number Diff line
@@ -1633,11 +1633,13 @@ static int snd_rawmidi_dev_register(struct snd_device *device) 
		return -EBUSY;

	}

	list_add_tail(&rmidi->list, &snd_rawmidi_devices);

	mutex_unlock(&register_mutex);

	err = snd_register_device(SNDRV_DEVICE_TYPE_RAWMIDI,

				  rmidi->card, rmidi->device,

				  &snd_rawmidi_f_ops, rmidi, &rmidi->dev);

	if (err < 0) {

		rmidi_err(rmidi, "unable to register\n");

		mutex_lock(&register_mutex);

		list_del(&rmidi->list);

		mutex_unlock(&register_mutex);

		return err;
@@ -1645,6 +1647,7 @@ static int snd_rawmidi_dev_register(struct snd_device *device) 
	if (rmidi->ops && rmidi->ops->dev_register &&

	    (err = rmidi->ops->dev_register(rmidi)) < 0) {

		snd_unregister_device(&rmidi->dev);

		mutex_lock(&register_mutex);

		list_del(&rmidi->list);

		mutex_unlock(&register_mutex);

		return err;
@@ -1677,7 +1680,6 @@ static int snd_rawmidi_dev_register(struct snd_device *device) 
		}

	}

#endif /* CONFIG_SND_OSSEMUL */

	mutex_unlock(&register_mutex);

	sprintf(name, "midi%d", rmidi->device);

	entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root);

	if (entry) {

sound/core/timer.c

+32 −2
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
#include <sound/initval.h>

#include <linux/kmod.h>



/* internal flags */

#define SNDRV_TIMER_IFLG_PAUSED		0x00010000



#if IS_ENABLED(CONFIG_SND_HRTIMER)

#define DEFAULT_TIMER_LIMIT 4

#else
@@ -294,8 +297,21 @@ int snd_timer_open(struct snd_timer_instance **ti, 
		get_device(&timer->card->card_dev);

	timeri->slave_class = tid->dev_sclass;

	timeri->slave_id = slave_id;

	if (list_empty(&timer->open_list_head) && timer->hw.open)

		timer->hw.open(timer);



	if (list_empty(&timer->open_list_head) && timer->hw.open) {

		int err = timer->hw.open(timer);

		if (err) {

			kfree(timeri->owner);

			kfree(timeri);



			if (timer->card)

				put_device(&timer->card->card_dev);

			module_put(timer->module);

			mutex_unlock(&register_mutex);

			return err;

		}

	}



	list_add_tail(&timeri->open_list, &timer->open_list_head);

	snd_timer_check_master(timeri);

	mutex_unlock(&register_mutex);
@@ -526,6 +542,10 @@ static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop) 
		}

	}

	timeri->flags &= ~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START);

	if (stop)

		timeri->flags &= ~SNDRV_TIMER_IFLG_PAUSED;

	else

		timeri->flags |= SNDRV_TIMER_IFLG_PAUSED;

	snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :

			  SNDRV_TIMER_EVENT_CONTINUE);

 unlock:
@@ -587,6 +607,10 @@ int snd_timer_stop(struct snd_timer_instance *timeri) 
 */

int snd_timer_continue(struct snd_timer_instance *timeri)

{

	/* timer can continue only after pause */

	if (!(timeri->flags & SNDRV_TIMER_IFLG_PAUSED))

		return -EINVAL;



	if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE)

		return snd_timer_start_slave(timeri, false);

	else
@@ -813,6 +837,7 @@ int snd_timer_new(struct snd_card *card, char *id, struct snd_timer_id *tid, 
	timer->tmr_subdevice = tid->subdevice;

	if (id)

		strlcpy(timer->id, id, sizeof(timer->id));

	timer->sticks = 1;

	INIT_LIST_HEAD(&timer->device_list);

	INIT_LIST_HEAD(&timer->open_list_head);

	INIT_LIST_HEAD(&timer->active_list_head);
@@ -1817,6 +1842,9 @@ static int snd_timer_user_continue(struct file *file) 
	tu = file->private_data;

	if (!tu->timeri)

		return -EBADFD;

	/* start timer instead of continue if it's not used before */

	if (!(tu->timeri->flags & SNDRV_TIMER_IFLG_PAUSED))

		return snd_timer_user_start(file);

	tu->timeri->lost = 0;

	return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;

}
@@ -1958,6 +1986,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 
		tu->qused--;

		spin_unlock_irq(&tu->qlock);



		mutex_lock(&tu->ioctl_lock);

		if (tu->tread) {

			if (copy_to_user(buffer, &tu->tqueue[qhead],

					 sizeof(struct snd_timer_tread)))
@@ -1967,6 +1996,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, 
					 sizeof(struct snd_timer_read)))

				err = -EFAULT;

		}

		mutex_unlock(&tu->ioctl_lock);



		spin_lock_irq(&tu->qlock);

		if (err < 0)

sound/firewire/fireworks/fireworks.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ struct snd_efw { 
	u8 *resp_buf;

	u8 *pull_ptr;

	u8 *push_ptr;

	unsigned int resp_queues;

};



int snd_efw_transaction_cmd(struct fw_unit *unit,

sound/firewire/fireworks/fireworks_hwdep.c

+52 −19
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ hwdep_read_resp_buf(struct snd_efw *efw, char __user *buf, long remained, 
{

	unsigned int length, till_end, type;

	struct snd_efw_transaction *t;

	u8 *pull_ptr;

	long count = 0;



	if (remained < sizeof(type) + sizeof(struct snd_efw_transaction))
@@ -38,8 +39,17 @@ hwdep_read_resp_buf(struct snd_efw *efw, char __user *buf, long remained, 
	buf += sizeof(type);



	/* write into buffer as many responses as possible */

	while (efw->resp_queues > 0) {

		t = (struct snd_efw_transaction *)(efw->pull_ptr);

	spin_lock_irq(&efw->lock);



	/*

	 * When another task reaches here during this task's access to user

	 * space, it picks up current position in buffer and can read the same

	 * series of responses.

	 */

	pull_ptr = efw->pull_ptr;



	while (efw->push_ptr != pull_ptr) {

		t = (struct snd_efw_transaction *)(pull_ptr);

		length = be32_to_cpu(t->length) * sizeof(__be32);



		/* confirm enough space for this response */
@@ -49,26 +59,39 @@ hwdep_read_resp_buf(struct snd_efw *efw, char __user *buf, long remained, 
		/* copy from ring buffer to user buffer */

		while (length > 0) {

			till_end = snd_efw_resp_buf_size -

				(unsigned int)(efw->pull_ptr - efw->resp_buf);

				(unsigned int)(pull_ptr - efw->resp_buf);

			till_end = min_t(unsigned int, length, till_end);



			if (copy_to_user(buf, efw->pull_ptr, till_end))

			spin_unlock_irq(&efw->lock);



			if (copy_to_user(buf, pull_ptr, till_end))

				return -EFAULT;



			efw->pull_ptr += till_end;

			if (efw->pull_ptr >= efw->resp_buf +

					     snd_efw_resp_buf_size)

				efw->pull_ptr -= snd_efw_resp_buf_size;

			spin_lock_irq(&efw->lock);



			pull_ptr += till_end;

			if (pull_ptr >= efw->resp_buf + snd_efw_resp_buf_size)

				pull_ptr -= snd_efw_resp_buf_size;



			length -= till_end;

			buf += till_end;

			count += till_end;

			remained -= till_end;

		}



		efw->resp_queues--;

	}



	/*

	 * All of tasks can read from the buffer nearly simultaneously, but the

	 * last position for each task is different depending on the length of

	 * given buffer. Here, for simplicity, a position of buffer is set by

	 * the latest task. It's better for a listening application to allow one

	 * thread to read from the buffer. Unless, each task can read different

	 * sequence of responses depending on variation of buffer length.

	 */

	efw->pull_ptr = pull_ptr;



	spin_unlock_irq(&efw->lock);



	return count;

}
@@ -76,14 +99,17 @@ static long 
hwdep_read_locked(struct snd_efw *efw, char __user *buf, long count,

		  loff_t *offset)

{

	union snd_firewire_event event;

	union snd_firewire_event event = {

		.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS,

	};



	memset(&event, 0, sizeof(event));

	spin_lock_irq(&efw->lock);



	event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS;

	event.lock_status.status = (efw->dev_lock_count > 0);

	efw->dev_lock_changed = false;



	spin_unlock_irq(&efw->lock);



	count = min_t(long, count, sizeof(event.lock_status));



	if (copy_to_user(buf, &event, count))
@@ -98,10 +124,15 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, 
{

	struct snd_efw *efw = hwdep->private_data;

	DEFINE_WAIT(wait);

	bool dev_lock_changed;

	bool queued;



	spin_lock_irq(&efw->lock);



	while ((!efw->dev_lock_changed) && (efw->resp_queues == 0)) {

	dev_lock_changed = efw->dev_lock_changed;

	queued = efw->push_ptr != efw->pull_ptr;



	while (!dev_lock_changed && !queued) {

		prepare_to_wait(&efw->hwdep_wait, &wait, TASK_INTERRUPTIBLE);

		spin_unlock_irq(&efw->lock);

		schedule();
@@ -109,15 +140,17 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, 
		if (signal_pending(current))

			return -ERESTARTSYS;

		spin_lock_irq(&efw->lock);

		dev_lock_changed = efw->dev_lock_changed;

		queued = efw->push_ptr != efw->pull_ptr;

	}



	if (efw->dev_lock_changed)

	spin_unlock_irq(&efw->lock);



	if (dev_lock_changed)

		count = hwdep_read_locked(efw, buf, count, offset);

	else if (efw->resp_queues > 0)

	else if (queued)

		count = hwdep_read_resp_buf(efw, buf, count, offset);



	spin_unlock_irq(&efw->lock);



	return count;

}
@@ -160,7 +193,7 @@ hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait) 
	poll_wait(file, &efw->hwdep_wait, wait);



	spin_lock_irq(&efw->lock);

	if (efw->dev_lock_changed || (efw->resp_queues > 0))

	if (efw->dev_lock_changed || efw->pull_ptr != efw->push_ptr)

		events = POLLIN | POLLRDNORM;

	else

		events = 0;

sound/firewire/fireworks/fireworks_proc.c

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ proc_read_queues_state(struct snd_info_entry *entry, 
	else

		consumed = (unsigned int)(efw->push_ptr - efw->pull_ptr);



	snd_iprintf(buffer, "%d %d/%d\n",

		    efw->resp_queues, consumed, snd_efw_resp_buf_size);

	snd_iprintf(buffer, "%d/%d\n",

		    consumed, snd_efw_resp_buf_size);

}



static void