Attachment 115474 Details for Bug 90229 – patch to fix the issue

[patch] patch to fix the issue

0001-ALSA-jack-don-t-report-input-event-for-phantom-jack.patch (text/plain), 1.28 KB, created by Keyon on 2015-04-30 12:21:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Keyon

Created: 2015-04-30 12:21:55 UTC

Size: 1.28 KB

patch

obsolete

>From 212a32b049e09933c39d983c4d9943e9aee9dadf Mon Sep 17 00:00:00 2001
>From: Jie Yang <yang.jie@intel.com>
>Date: Thu, 30 Apr 2015 20:22:46 +0800
>Subject: [PATCH] ALSA: jack: don't report input event for phantom jack
>
>There is no input_dev for phantom jack, we should not report
>input event for it, otherwise, NULL pointer dereference error
>will occur.
>
>Signed-off-by: Jie Yang <yang.jie@intel.com>
>---
> sound/core/jack.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/sound/core/jack.c b/sound/core/jack.c
>index e8b51f5..0dbd618 100644
>--- a/sound/core/jack.c
>+++ b/sound/core/jack.c
>@@ -339,6 +339,13 @@ void snd_jack_report(struct snd_jack *jack, int status)
> 	if (!jack)
> 		return;
> 
>+	list_for_each_entry(jack_kctl, &jack->kctl_list, list)
>+		snd_kctl_jack_report(jack->card, jack_kctl->kctl,
>+					    status & jack_kctl->mask_bits);
>+
>+	if (!jack->input_dev)
>+		return;
>+
> 	for (i = 0; i < ARRAY_SIZE(jack->key); i++) {
> 		int testbit = SND_JACK_BTN_0 >> i;
> 
>@@ -357,10 +364,6 @@ void snd_jack_report(struct snd_jack *jack, int status)
> 
> 	input_sync(jack->input_dev);
> 
>-	list_for_each_entry(jack_kctl, &jack->kctl_list, list)
>-		snd_kctl_jack_report(jack->card, jack_kctl->kctl,
>-					    status & jack_kctl->mask_bits);
>-
> }
> EXPORT_SYMBOL(snd_jack_report);
> 
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 90229: 115431 | 115432 | 115474

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.