sound fixes for 5.3-rc3
Linus,
please pull sound fixes for v5.3-rc3 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.3-rc3
The topmost commit is 5d78e1c2b7f4be00bbe62141603a631dc7812f35
----------------------------------------------------------------
sound fixes for 5.3-rc3
- A further fix for syzcaller issues with USB-audio, addressing NULL dereference that was introduced by the recent fix
- Avoid a long delay at boot with HD-audio when i915 module was built but not installed, found on some Debian systems
- A fix of small race window at PCM draining
----------------------------------------------------------------
Hillf Danton (1):
ALSA: usb-audio: Fix gpf in snd_usb_pipe_sanity_check
Samuel Thibault (1):
ALSA: hda: Fix 1-minute detection delay when i915 module is not available
Yuki Tsunashima (1):
ALSA: pcm: fix lost wakeup event scenarios in snd_pcm_drain
--- sound/core/pcm_native.c | 3 ++- sound/hda/hdac_i915.c | 10 ++++++---- sound/usb/helper.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-)
sound/core/pcm_native.c +2 -1
@@ -1873,6 +1873,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,if (!to_check)break ;/* all drained */ init_waitqueue_entry (&wait, current); +set_current_state (TASK_INTERRUPTIBLE );add_wait_queue (&to_check->sleep, &wait);snd_pcm_stream_unlock_irq (substream);if (runtime->no_period_wakeup)
@@ -1885,7 +1886,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, } tout =msecs_to_jiffies (tout *1000 ); } - tout =schedule_timeout_interruptible (tout); + tout =schedule_timeout (tout);snd_pcm_stream_lock_irq (substream); group =snd_pcm_stream_group_ref (substream);
sound/hda/hdac_i915.c +6 -4
@@ -136,10 +136,12 @@ int snd_hdac_i915_init(struct hdac_bus *bus)if (!acomp)return -ENODEV ;if (!acomp->ops) { -request_module ("i915" ); -/* 60s timeout */ -wait_for_completion_timeout (&bind_complete, -msecs_to_jiffies (60 *1000 )); +if (!IS_ENABLED (CONFIG_MODULES ) || + !request_module ("i915" )) { +/* 60s timeout */ +wait_for_completion_timeout (&bind_complete, +msecs_to_jiffies (60 *1000 )); + } }if (!acomp->ops) {dev_info (bus->dev,"couldn't bind with audio component\n" );
sound/usb/helper.c +1 -1
@@ -72,7 +72,7 @@ int snd_usb_pipe_sanity_check(struct usb_device *dev, unsigned int pipe)struct usb_host_endpoint *ep; ep =usb_pipe_endpoint (dev, pipe); -if (usb_pipetype (pipe) != pipetypes[usb_endpoint_type (&ep->desc)]) +if (!ep ||usb_pipetype (pipe) != pipetypes[usb_endpoint_type (&ep->desc)])return -EINVAL ;return 0 ; }
The pull request you sent on Fri, 02 Aug 2019 11:38:08 +0200:
The pull request you sent on Fri, 02 Aug 2019 11:38:08 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.gittags/sound-5.3-rc3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/75cdf416b32293dfc348d4c06fcc775ba4dacff6
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker