sound fixes for 4.14-rc4
Subsystems (2)
Linus,
please pull sound fixes for v4.14-rc4 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.14-rc4
The topmost commit is 7682e399485fe19622b6fd82510b1f4551e48a25
----------------------------------------------------------------
sound fixes for 4.14-rc4
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
----------------------------------------------------------------
Baolin Wang (1):
ALSA: pcm: Fix structure definition for X32 ABI
Guneshwor Singh (1):
ALSA: compress: Remove unused variable
Kai-Heng Feng (1):
ALSA: usb-audio: Add sample rate quirk for Plantronics C310/C520-M
Meng Xu (1):
ALSA: asihpi: fix a potential double-fetch bug when copying puhm
Sriram Periyasamy (1):
ALSA: hda - program ICT bits to support HBR audio
Takashi Iwai (2):
ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
ALSA: usx2y: Suppress kernel warning at page allocation failures
Takashi Sakamoto (1):
Revert "ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members"
--- include/sound/hda_verbs.h | 1 + sound/core/compress_offload.c | 3 +-- sound/core/pcm_compat.c | 1 + sound/pci/asihpi/hpioctl.c | 12 ++++++++---- sound/pci/echoaudio/echoaudio.c | 6 +++--- sound/pci/hda/patch_hdmi.c | 21 +++++++++++++++++++++ sound/usb/card.c | 20 ++++++++++++++++++++ sound/usb/quirks.c | 2 ++ sound/usb/usx2y/usb_stream.c | 6 ++++-- 9 files changed, 61 insertions(+), 11 deletions(-)
include/sound/hda_verbs.h +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ; }
sound/pci/hda/patch_hdmi.c +21 -0
@@ -906,6 +906,7 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid, hda_nid_t pin_nid, u32 stream_tag, int format) { struct hdmi_spec *spec = codec->spec; +unsigned int param;int err; err = spec->ops.pin_hbr_setup (codec, pin_nid,is_hbr_format (format));
@@ -915,6 +916,26 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,return err; } +if (is_haswell_plus (codec)) { + +/* +* on recent platforms IEC Coding Type is required for HBR +* support, read current Digital Converter settings and set +* ICT bitfield if needed. +*/ + param =snd_hda_codec_read (codec, cvt_nid,0 , +AC_VERB_GET_DIGI_CONVERT_1 ,0 ); + + param = (param >>16 ) & ~(AC_DIG3_ICT ); + +/* on recent platforms ICT mode is required for HBR support */ +if (is_hbr_format (format)) + param |=0x1 ; + +snd_hda_codec_write (codec, cvt_nid,0 , +AC_VERB_SET_DIGI_CONVERT_3 , param); + } +snd_hda_codec_setup_stream (codec, cvt_nid, stream_tag,0 , format);return 0 ; }
sound/usb/card.c +20 -0
@@ -221,6 +221,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)struct usb_interface_descriptor *altsd;void *control_header;int i, protocol; +int rest_bytes;/* find audiocontrol interface */ host_iface = &usb_ifnum_to_if (dev, ctrlif)->altsetting[0 ];
@@ -235,6 +236,15 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)return -EINVAL ; } + rest_bytes = (void *)(host_iface->extra + host_iface->extralen) - + control_header; + +/* just to be sure -- this shouldn't hit at all */ +if (rest_bytes <=0 ) { +dev_err (&dev->dev,"invalid control header\n" ); +return -EINVAL ; + } +switch (protocol) {default : dev_warn(&dev->dev,
@@ -245,11 +255,21 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)case UAC_VERSION_1 : {struct uac1_ac_header_descriptor *h1 = control_header; +if (rest_bytes <sizeof (*h1)) { +dev_err (&dev->dev,"too short v1 buffer descriptor\n" ); +return -EINVAL ; + } +if (!h1->bInCollection) {dev_info (&dev->dev,"skipping empty audio interface (v1)\n" );return -EINVAL ; } +if (rest_bytes < h1->bLength) { +dev_err (&dev->dev,"invalid buffer length (v1)\n" ); +return -EINVAL ; + } +if (h1->bLength <sizeof (*h1) + h1->bInCollection) {dev_err (&dev->dev,"invalid UAC_HEADER (v1)\n" );return -EINVAL ;
sound/usb/quirks.c +2 -0
@@ -1137,6 +1137,8 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)case USB_ID (0x047F ,0x02F7 ):/* Plantronics BT-600 */ case USB_ID (0x047F ,0x0415 ):/* Plantronics BT-300 */ case USB_ID (0x047F ,0xAA05 ):/* Plantronics DA45 */ +case USB_ID (0x047F ,0xC022 ):/* Plantronics C310 */ +case USB_ID (0x047F ,0xC036 ):/* Plantronics C520-M */ case USB_ID (0x04D8 ,0xFEEA ):/* Benchmark DAC1 Pre */ case USB_ID (0x0556 ,0x0014 ):/* Phoenix Audio TMX320VC */ case USB_ID (0x05A3 ,0x9420 ):/* ELP HD USB Camera */
sound/usb/usx2y/usb_stream.c +4 -2
@@ -191,7 +191,8 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk, } pg =get_order (read_size); - sk->s = (void *)__get_free_pages (GFP_KERNEL |__GFP_COMP|__GFP_ZERO, pg); + sk->s = (void *)__get_free_pages (GFP_KERNEL |__GFP_COMP|__GFP_ZERO| + __GFP_NOWARN, pg);if (!sk->s) {snd_printk (KERN_WARNING "couldn't __get_free_pages()\n" ); goto out;
@@ -211,7 +212,8 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk, pg =get_order (write_size); sk->write_page = - (void *)__get_free_pages (GFP_KERNEL |__GFP_COMP|__GFP_ZERO, pg); + (void *)__get_free_pages (GFP_KERNEL |__GFP_COMP|__GFP_ZERO| + __GFP_NOWARN, pg);if (!sk->write_page) {snd_printk (KERN_WARNING "couldn't __get_free_pages()\n" );usb_stream_free (sk);