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

Commit 0f380715 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes, mostly with stable ones:

 - X32 ABI fix for PCM; likely not so many people suffer from it, but
   still better to fix

 - Two minor kernel warning fixes on USB audio devices spotted by
   syzkaller

 - Regression fix of echoaudio due to its inconsistent dimension

 - Fix for HBR support on Intel DP audio, on some recent chips

 - USB-audio quirk for yet another Plantronics devices

 - Fix for potential double-fetch in ASIHPI FIFO queue"

* tag 'sound-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usx2y: Suppress kernel warning at page allocation failures
  Revert "ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members"
  ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
  ALSA: pcm: Fix structure definition for X32 ABI
  ALSA: usb-audio: Add sample rate quirk for Plantronics C310/C520-M
  ALSA: hda - program ICT bits to support HBR audio
  ALSA: asihpi: fix a potential double-fetch bug when copying puhm
  ALSA: compress: Remove unused variable
parents 77ede3a0 7682e399

include/sound/hda_verbs.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ enum { 
#define AC_VERB_SET_EAPD_BTLENABLE		0x70c

#define AC_VERB_SET_DIGI_CONVERT_1		0x70d

#define AC_VERB_SET_DIGI_CONVERT_2		0x70e

#define AC_VERB_SET_DIGI_CONVERT_3		0x73e

#define AC_VERB_SET_VOLUME_KNOB_CONTROL		0x70f

#define AC_VERB_SET_GPIO_DATA			0x715

#define AC_VERB_SET_GPIO_MASK			0x716

sound/core/compress_offload.c

+1 −2
Original line number Diff line number Diff line
@@ -948,14 +948,13 @@ static const struct file_operations snd_compr_file_ops = { 
static int snd_compress_dev_register(struct snd_device *device)

{

	int ret = -EINVAL;

	char str[16];

	struct snd_compr *compr;



	if (snd_BUG_ON(!device || !device->device_data))

		return -EBADFD;

	compr = device->device_data;



	pr_debug("reg %s for device %s, direction %d\n", str, compr->name,

	pr_debug("reg device %s, direction %d\n", compr->name,

			compr->direction);

	/* register compressed device */

	ret = snd_register_device(SNDRV_DEVICE_TYPE_COMPRESS,

sound/core/pcm_compat.c

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ struct snd_pcm_mmap_status_x32 { 
	u32 pad2; /* alignment */

	struct timespec tstamp;

	s32 suspended_state;

	s32 pad3;

	struct timespec audio_tstamp;

} __packed;

sound/pci/asihpi/hpioctl.c

+8 −4
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	void __user *puhr;

	union hpi_message_buffer_v1 *hm;

	union hpi_response_buffer_v1 *hr;

	u16 msg_size;

	u16 res_max_size;

	u32 uncopied_bytes;

	int err = 0;
@@ -127,22 +128,25 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	}



	/* Now read the message size and data from user space.  */

	if (get_user(hm->h.size, (u16 __user *)puhm)) {

	if (get_user(msg_size, (u16 __user *)puhm)) {

		err = -EFAULT;

		goto out;

	}

	if (hm->h.size > sizeof(*hm))

		hm->h.size = sizeof(*hm);

	if (msg_size > sizeof(*hm))

		msg_size = sizeof(*hm);



	/* printk(KERN_INFO "message size %d\n", hm->h.wSize); */



	uncopied_bytes = copy_from_user(hm, puhm, hm->h.size);

	uncopied_bytes = copy_from_user(hm, puhm, msg_size);

	if (uncopied_bytes) {

		HPI_DEBUG_LOG(ERROR, "uncopied bytes %d\n", uncopied_bytes);

		err = -EFAULT;

		goto out;

	}



	/* Override h.size in case it is changed between two userspace fetches */

	hm->h.size = msg_size;



	if (get_user(res_max_size, (u16 __user *)puhr)) {

		err = -EFAULT;

		goto out;

sound/pci/echoaudio/echoaudio.c

+3 −3
Original line number Diff line number Diff line
@@ -1272,11 +1272,11 @@ static int snd_echo_mixer_info(struct snd_kcontrol *kcontrol, 


	chip = snd_kcontrol_chip(kcontrol);

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 1;

	uinfo->value.integer.min = ECHOGAIN_MINOUT;

	uinfo->value.integer.max = ECHOGAIN_MAXOUT;

	uinfo->dimen.d[0] = num_busses_out(chip);

	uinfo->dimen.d[1] = num_busses_in(chip);

	uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1];

	return 0;

}
@@ -1344,11 +1344,11 @@ static int snd_echo_vmixer_info(struct snd_kcontrol *kcontrol, 


	chip = snd_kcontrol_chip(kcontrol);

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 1;

	uinfo->value.integer.min = ECHOGAIN_MINOUT;

	uinfo->value.integer.max = ECHOGAIN_MAXOUT;

	uinfo->dimen.d[0] = num_busses_out(chip);

	uinfo->dimen.d[1] = num_pipes_out(chip);

	uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1];

	return 0;

}
@@ -1728,6 +1728,7 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol, 
				  struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = 96;

	uinfo->value.integer.min = ECHOGAIN_MINOUT;

	uinfo->value.integer.max = 0;

#ifdef ECHOCARD_HAS_VMIXER
@@ -1737,7 +1738,6 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol, 
#endif

	uinfo->dimen.d[1] = 16;	/* 16 channels */

	uinfo->dimen.d[2] = 2;	/* 0=level, 1=peak */

	uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1] * uinfo->dimen.d[2];

	return 0;

}