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

Commit 7ff50002 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A significant amount of fixes have been piled up at this time.

   - Possible Spectre v1 coverage in OSS sequencer API, control API,
     HD-audio hwdep ioctl, ASIHPI hwdep ioctl, OPL3, and HDSPM/RME
     channel_info API.

   - A regression fix in PCM delay reporting that happened at the code
     refactoring for the set_fs() removal

   - The long-standing bug in PCM sync_ptr ioctl that missed the audio
     timestamp field

   - USB-audio regression fixes due to the recent UAC2 jack support

   - vm_fault_t conversions in a couple of places

   - ASoC topology API fixes

   - Assorted driver fixes:
      * ASoC rsnd, FSL, Intel SST, DMIC, AMD, ADAU17x1, Realtek codec
      * FireWire typo fix
      * HD-audio quirks and USB-audio Dell fixup
      * USB-audio UAC3 corrections"

* tag 'sound-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits)
  ALSA: dice: fix error path to destroy initialized stream data
  ALSA: hda - Skip jack and others for non-existing PCM streams
  ALSA: hda/realtek - change the location for one of two front mics
  ALSA: rme9652: Hardening for potential Spectre v1
  ALSA: hdspm: Hardening for potential Spectre v1
  ALSA: asihpi: Hardening for potential Spectre v1
  ALSA: opl3: Hardening for potential Spectre v1
  ALSA: hda: Hardening for potential Spectre v1
  ALSA: control: Hardening for potential Spectre v1
  ALSA: seq: oss: Hardening for potential Spectre v1
  ALSA: seq: oss: Fix unbalanced use lock for synth MIDI device
  ALSA: hda/realtek - Update ALC255 depop optimize
  ALSA: hda/realtek - Add some fixes for ALC233
  ALSA: pcm: Change return type to vm_fault_t
  ALSA: usx2y: Change return type to vm_fault_t
  ALSA: usb-audio: ADC3: Fix channel mapping conversion for ADC3.
  ALSA: dice: fix OUI for TC group
  ALSA: usb-audio: Skip broken EU on Dell dock USB-audio
  ALSA: usb-audio: Fix missing endian conversion
  ALSA: usb-audio: Fix forgotten conversion of control query functions
  ...
parents ee7141c9 0f925660

include/sound/control.h

+5 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include <linux/wait.h>

#include <linux/nospec.h>

#include <sound/asound.h>



#define snd_kcontrol_chip(kcontrol) ((kcontrol)->private_data)
@@ -148,12 +149,14 @@ int snd_ctl_get_preferred_subdevice(struct snd_card *card, int type); 


static inline unsigned int snd_ctl_get_ioffnum(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)

{

	return id->numid - kctl->id.numid;

	unsigned int ioff = id->numid - kctl->id.numid;

	return array_index_nospec(ioff, kctl->count);

}



static inline unsigned int snd_ctl_get_ioffidx(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)

{

	return id->index - kctl->id.index;

	unsigned int ioff = id->index - kctl->id.index;

	return array_index_nospec(ioff, kctl->count);

}



static inline unsigned int snd_ctl_get_ioff(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)

sound/core/control.c

+1 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file, 
                             int op_flag)

{

	struct snd_ctl_tlv header;

	unsigned int *container;

	unsigned int __user *container;

	unsigned int container_size;

	struct snd_kcontrol *kctl;

	struct snd_ctl_elem_id id;

sound/core/pcm_compat.c

+4 −3
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream, 
				      s32 __user *src)

{

	snd_pcm_sframes_t delay;

	int err;



	delay = snd_pcm_delay(substream);

	if (delay < 0)

		return delay;

	err = snd_pcm_delay(substream, &delay);

	if (err)

		return err;

	if (put_user(delay, src))

		return -EFAULT;

	return 0;

sound/core/pcm_native.c

+15 −15
Original line number Diff line number Diff line
@@ -2692,7 +2692,8 @@ static int snd_pcm_hwsync(struct snd_pcm_substream *substream) 
	return err;

}

		

static snd_pcm_sframes_t snd_pcm_delay(struct snd_pcm_substream *substream)

static int snd_pcm_delay(struct snd_pcm_substream *substream,

			 snd_pcm_sframes_t *delay)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	int err;
@@ -2708,7 +2709,9 @@ static snd_pcm_sframes_t snd_pcm_delay(struct snd_pcm_substream *substream) 
		n += runtime->delay;

	}

	snd_pcm_stream_unlock_irq(substream);

	return err < 0 ? err : n;

	if (!err)

		*delay = n;

	return err;

}

		

static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream,
@@ -2751,6 +2754,7 @@ static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream, 
	sync_ptr.s.status.hw_ptr = status->hw_ptr;

	sync_ptr.s.status.tstamp = status->tstamp;

	sync_ptr.s.status.suspended_state = status->suspended_state;

	sync_ptr.s.status.audio_tstamp = status->audio_tstamp;

	snd_pcm_stream_unlock_irq(substream);

	if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr)))

		return -EFAULT;
@@ -2916,11 +2920,13 @@ static int snd_pcm_common_ioctl(struct file *file, 
		return snd_pcm_hwsync(substream);

	case SNDRV_PCM_IOCTL_DELAY:

	{

		snd_pcm_sframes_t delay = snd_pcm_delay(substream);

		snd_pcm_sframes_t delay;

		snd_pcm_sframes_t __user *res = arg;

		int err;



		if (delay < 0)

			return delay;

		err = snd_pcm_delay(substream, &delay);

		if (err)

			return err;

		if (put_user(delay, res))

			return -EFAULT;

		return 0;
@@ -3008,13 +3014,7 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream, 
	case SNDRV_PCM_IOCTL_DROP:

		return snd_pcm_drop(substream);

	case SNDRV_PCM_IOCTL_DELAY:

	{

		result = snd_pcm_delay(substream);

		if (result < 0)

			return result;

		*frames = result;

		return 0;

	}

		return snd_pcm_delay(substream, frames);

	default:

		return -EINVAL;

	}
@@ -3234,7 +3234,7 @@ static __poll_t snd_pcm_capture_poll(struct file *file, poll_table * wait) 
/*

 * mmap status record

 */

static int snd_pcm_mmap_status_fault(struct vm_fault *vmf)

static vm_fault_t snd_pcm_mmap_status_fault(struct vm_fault *vmf)

{

	struct snd_pcm_substream *substream = vmf->vma->vm_private_data;

	struct snd_pcm_runtime *runtime;
@@ -3270,7 +3270,7 @@ static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file 
/*

 * mmap control record

 */

static int snd_pcm_mmap_control_fault(struct vm_fault *vmf)

static vm_fault_t snd_pcm_mmap_control_fault(struct vm_fault *vmf)

{

	struct snd_pcm_substream *substream = vmf->vma->vm_private_data;

	struct snd_pcm_runtime *runtime;
@@ -3359,7 +3359,7 @@ snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs) 
/*

 * fault callback for mmapping a RAM page

 */

static int snd_pcm_mmap_data_fault(struct vm_fault *vmf)

static vm_fault_t snd_pcm_mmap_data_fault(struct vm_fault *vmf)

{

	struct snd_pcm_substream *substream = vmf->vma->vm_private_data;

	struct snd_pcm_runtime *runtime;

sound/core/seq/oss/seq_oss_event.c

+9 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <sound/seq_oss_legacy.h>

#include "seq_oss_readq.h"

#include "seq_oss_writeq.h"

#include <linux/nospec.h>





/*
@@ -287,10 +288,10 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st 
{

	struct seq_oss_synthinfo *info;



	if (!snd_seq_oss_synth_is_valid(dp, dev))

	info = snd_seq_oss_synth_info(dp, dev);

	if (!info)

		return -ENXIO;



	info = &dp->synths[dev];

	switch (info->arg.event_passing) {

	case SNDRV_SEQ_OSS_PROCESS_EVENTS:

		if (! info->ch || ch < 0 || ch >= info->nr_voices) {
@@ -298,6 +299,7 @@ note_on_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, st 
			return set_note_event(dp, dev, SNDRV_SEQ_EVENT_NOTEON, ch, note, vel, ev);

		}



		ch = array_index_nospec(ch, info->nr_voices);

		if (note == 255 && info->ch[ch].note >= 0) {

			/* volume control */

			int type;
@@ -347,10 +349,10 @@ note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, s 
{

	struct seq_oss_synthinfo *info;



	if (!snd_seq_oss_synth_is_valid(dp, dev))

	info = snd_seq_oss_synth_info(dp, dev);

	if (!info)

		return -ENXIO;



	info = &dp->synths[dev];

	switch (info->arg.event_passing) {

	case SNDRV_SEQ_OSS_PROCESS_EVENTS:

		if (! info->ch || ch < 0 || ch >= info->nr_voices) {
@@ -358,6 +360,7 @@ note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, s 
			return set_note_event(dp, dev, SNDRV_SEQ_EVENT_NOTEON, ch, note, vel, ev);

		}



		ch = array_index_nospec(ch, info->nr_voices);

		if (info->ch[ch].note >= 0) {

			note = info->ch[ch].note;

			info->ch[ch].vel = 0;
@@ -381,7 +384,7 @@ note_off_event(struct seq_oss_devinfo *dp, int dev, int ch, int note, int vel, s 
static int

set_note_event(struct seq_oss_devinfo *dp, int dev, int type, int ch, int note, int vel, struct snd_seq_event *ev)

{

	if (! snd_seq_oss_synth_is_valid(dp, dev))

	if (!snd_seq_oss_synth_info(dp, dev))

		return -ENXIO;

	

	ev->type = type;
@@ -399,7 +402,7 @@ set_note_event(struct seq_oss_devinfo *dp, int dev, int type, int ch, int note, 
static int

set_control_event(struct seq_oss_devinfo *dp, int dev, int type, int ch, int param, int val, struct snd_seq_event *ev)

{

	if (! snd_seq_oss_synth_is_valid(dp, dev))

	if (!snd_seq_oss_synth_info(dp, dev))

		return -ENXIO;

	

	ev->type = type;