Skip to contentSkip to conversation

ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete

PATCH Superseded Ricardo Ribalda 3 participants 4 messages Dec 11, 2020 – Dec 15, 2020

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Intel: Skylake: skl-topology: Fix OOPs ib skl_tplg_complete

If dobj->control is not initialized we end up in an OOPs during skl_tplg_complete:

[   26.553358] BUG: kernel NULL pointer dereference, address:
0000000000000078
[   26.561151] #PF: supervisor read access in kernel mode
[   26.566897] #PF: error_code(0x0000) - not-present page
[   26.572642] PGD 0 P4D 0
[   26.575479] Oops: 0000 [#1] PREEMPT SMP PTI
[   26.580158] CPU: 2 PID: 2082 Comm: udevd Tainted: G         C
5.4.81 #4
[   26.588232] Hardware name: HP Soraka/Soraka, BIOS
Google_Soraka.10431.106.0 12/03/2019
[   26.597082] RIP: 0010:skl_tplg_complete+0x70/0x144 [snd_soc_skl]
Fixes 2d744ecf2b98 ("ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHL")
---
 sound/soc/intel/skylake/skl-topology.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-topology.c +8 -7
index 40bee10b0c65..0955cbb4e918 100644
@@ -3619,19 +3619,20 @@ static void skl_tplg_complete(struct snd_soc_component *component)
 
 	list_for_each_entry(dobj, &component->dobj_list, list) {
 		struct snd_kcontrol *kcontrol = dobj->control.kcontrol;
-		struct soc_enum *se =
-			(struct soc_enum *)kcontrol->private_value;
-		char **texts = dobj->control.dtexts;
+		struct soc_enum *se;
+		char **texts;
 		char chan_text[4];
 
-		if (dobj->type != SND_SOC_DOBJ_ENUM ||
-		    dobj->control.kcontrol->put !=
-		    skl_tplg_multi_config_set_dmic)
+		if (dobj->type != SND_SOC_DOBJ_ENUM || !kcontrol ||
+		    kcontrol->put != skl_tplg_multi_config_set_dmic)
 			continue;
+
+		se = (struct soc_enum *)kcontrol->private_value;
+		texts = dobj->control.dtexts;
 		sprintf(chan_text, "c%d", mach->mach_params.dmic_num);
 
 		for (i = 0; i < se->items; i++) {
-			struct snd_ctl_elem_value val;
+			struct snd_ctl_elem_value val = {};
 
 			if (strstr(texts[i], chan_text)) {
 				val.value.enumerated.item[0] = i;
Signature · 1 line
2.29.2.576.ga3fc446d84-goog
maintainer
#1 lore raw

sound/soc/intel/skylake/skl-topology.c static void skl_tplg_complete(struct snd_soc_component *component) · line 3635

Quoted 6 lines · Ricardo Ribalda

If dobj->control is not initialized we end up in an OOPs during skl_tplg_complete:

sound/soc/intel/skylake/skl-topology.c +1 -1
 		for (i = 0; i < se->items; i++) {
-			struct snd_ctl_elem_value val;
+			struct snd_ctl_elem_value val = {};

This bit looks like a separate fix?

#2 lore raw
In reply to Ricardo Ribalda
Quoted 44 lines

If dobj->control is not initialized we end up in an OOPs during skl_tplg_complete:

[   26.553358] BUG: kernel NULL pointer dereference, address:
0000000000000078
[   26.561151] #PF: supervisor read access in kernel mode
[   26.566897] #PF: error_code(0x0000) - not-present page
[   26.572642] PGD 0 P4D 0
[   26.575479] Oops: 0000 [#1] PREEMPT SMP PTI
[   26.580158] CPU: 2 PID: 2082 Comm: udevd Tainted: G         C
5.4.81 #4
[   26.588232] Hardware name: HP Soraka/Soraka, BIOS
Google_Soraka.10431.106.0 12/03/2019
[   26.597082] RIP: 0010:skl_tplg_complete+0x70/0x144 [snd_soc_skl]
Fixes 2d744ecf2b98 ("ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHL")
---
  sound/soc/intel/skylake/skl-topology.c | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-topology.c +5 -6
index 40bee10b0c65..0955cbb4e918 100644
@@ -3619,19 +3619,20 @@ static void skl_tplg_complete(struct snd_soc_component *component)
 
  	list_for_each_entry(dobj, &component->dobj_list, list) {
  		struct snd_kcontrol *kcontrol = dobj->control.kcontrol;
-		struct soc_enum *se =
-			(struct soc_enum *)kcontrol->private_value;
-		char **texts = dobj->control.dtexts;
+		struct soc_enum *se;
+		char **texts;
  		char chan_text[4];
 
-		if (dobj->type != SND_SOC_DOBJ_ENUM ||
-		    dobj->control.kcontrol->put !=
-		    skl_tplg_multi_config_set_dmic)
+		if (dobj->type != SND_SOC_DOBJ_ENUM || !kcontrol ||
+		    kcontrol->put != skl_tplg_multi_config_set_dmic)
  			continue;
+

sound/soc/intel/skylake/skl-topology.c static void skl_tplg_complete(struct snd_soc_component *component) · line 3638

Quoted 10 lines
sound/soc/intel/skylake/skl-topology.c +3 -1
+		se = (struct soc_enum *)kcontrol->private_value;
+		texts = dobj->control.dtexts;
  		sprintf(chan_text, "c%d", mach->mach_params.dmic_num);
 
  		for (i = 0; i < se->items; i++) {
-			struct snd_ctl_elem_value val;
+			struct snd_ctl_elem_value val = {};
 
  			if (strstr(texts[i], chan_text)) {
  				val.value.enumerated.item[0] = i;

Hi Ricardo,

there is another thread regarding this issue (with fix provided by Lukasz Majczak), you can find it here:

    https://www.spinics.net/lists/stable/msg431524.html

Thanks,
Mateusz

#3 lore raw

Hi Mateusz

Quoted 59 lines · Mateusz
Quoted 45 lines

If dobj->control is not initialized we end up in an OOPs during skl_tplg_complete:

[   26.553358] BUG: kernel NULL pointer dereference, address:
0000000000000078
[   26.561151] #PF: supervisor read access in kernel mode
[   26.566897] #PF: error_code(0x0000) - not-present page
[   26.572642] PGD 0 P4D 0
[   26.575479] Oops: 0000 [#1] PREEMPT SMP PTI
[   26.580158] CPU: 2 PID: 2082 Comm: udevd Tainted: G         C
5.4.81 #4
[   26.588232] Hardware name: HP Soraka/Soraka, BIOS
Google_Soraka.10431.106.0 12/03/2019
[   26.597082] RIP: 0010:skl_tplg_complete+0x70/0x144 [snd_soc_skl]
Fixes 2d744ecf2b98 ("ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHL")
---
  sound/soc/intel/skylake/skl-topology.c | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
sound/soc/intel/skylake/skl-topology.c +5 -6
index 40bee10b0c65..0955cbb4e918 100644
@@ -3619,19 +3619,20 @@ static void skl_tplg_complete(struct snd_soc_component *component)
 
      list_for_each_entry(dobj, &component->dobj_list, list) {
              struct snd_kcontrol *kcontrol = dobj->control.kcontrol;
-             struct soc_enum *se =
-                     (struct soc_enum *)kcontrol->private_value;
-             char **texts = dobj->control.dtexts;
+             struct soc_enum *se;
+             char **texts;
              char chan_text[4];
 
-             if (dobj->type != SND_SOC_DOBJ_ENUM ||
-                 dobj->control.kcontrol->put !=
-                 skl_tplg_multi_config_set_dmic)
+             if (dobj->type != SND_SOC_DOBJ_ENUM || !kcontrol ||
+                 kcontrol->put != skl_tplg_multi_config_set_dmic)
                      continue;
+

sound/soc/intel/skylake/skl-topology.c static void skl_tplg_complete(struct snd_soc_component *component) · line 3638

Quoted 10 lines
sound/soc/intel/skylake/skl-topology.c +3 -1
+             se = (struct soc_enum *)kcontrol->private_value;
+             texts = dobj->control.dtexts;
              sprintf(chan_text, "c%d", mach->mach_params.dmic_num);
 
              for (i = 0; i < se->items; i++) {
-                     struct snd_ctl_elem_value val;
+                     struct snd_ctl_elem_value val = {};
 
                      if (strstr(texts[i], chan_text)) {
                              val.value.enumerated.item[0] = i;

Hi Ricardo,

Quoted 4 lines

there is another thread regarding this issue (with fix provided by Lukasz Majczak), you can find it here:

     https://www.spinics.net/lists/stable/msg431524.html

I saw it just after I sent it :(. The most embarrassing thing is that we are working in the same project ;)

Sorry for the noise

Quoted 5 lines

Thanks,
Mateusz

Signature · 1 line
Ricardo Ribalda