All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
@ 2022-03-18  7:12 ` Dan Carpenter
  0 siblings, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2022-03-18  7:12 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Ranjani Sridharan
  Cc: Liam Girdwood, Kai Vehmanen, Daniel Baluta, Mark Brown,
	Jaroslav Kysela, Takashi Iwai, Péter Ujfalusi, Bard Liao,
	sound-open-firmware, alsa-devel, kernel-janitors

The "dia" pointer can be NULL, so handle that condition first before
storing "dia->private".

Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 sound/soc/sof/pcm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 1661b0bc6f12..71f5bce0c4c7 100644
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
 	struct snd_sof_dai *dai =
 		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
 	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
-	struct sof_dai_private_data *private = dai->private;
+	struct sof_dai_private_data *private;
 	struct snd_soc_dpcm *dpcm;
 
 	/* no topology exists for this BE, try a common configuration */
@@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
 	/* read format from topology */
 	snd_mask_none(fmt);
 
+	private = dai->private;
 	switch (private->comp_dai->config.frame_fmt) {
 	case SOF_IPC_FRAME_S16_LE:
 		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
@ 2022-03-18  7:12 ` Dan Carpenter
  0 siblings, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2022-03-18  7:12 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Ranjani Sridharan
  Cc: alsa-devel, Kai Vehmanen, Péter Ujfalusi, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Bard Liao,
	Daniel Baluta, sound-open-firmware

The "dia" pointer can be NULL, so handle that condition first before
storing "dia->private".

Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 sound/soc/sof/pcm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 1661b0bc6f12..71f5bce0c4c7 100644
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
 	struct snd_sof_dai *dai =
 		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
 	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
-	struct sof_dai_private_data *private = dai->private;
+	struct sof_dai_private_data *private;
 	struct snd_soc_dpcm *dpcm;
 
 	/* no topology exists for this BE, try a common configuration */
@@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
 	/* read format from topology */
 	snd_mask_none(fmt);
 
+	private = dai->private;
 	switch (private->comp_dai->config.frame_fmt) {
 	case SOF_IPC_FRAME_S16_LE:
 		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 2/2] ASoC: SOF: check for NULL before dereferencing
  2022-03-18  7:12 ` Dan Carpenter
@ 2022-03-18  7:13   ` Dan Carpenter
  -1 siblings, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2022-03-18  7:13 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Ranjani Sridharan
  Cc: Liam Girdwood, Kai Vehmanen, Daniel Baluta, Mark Brown,
	Jaroslav Kysela, Takashi Iwai, Bard Liao, Péter Ujfalusi,
	sound-open-firmware, alsa-devel, kernel-janitors

This code dereferences "dai" before checking whether it can be NULL.

Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 sound/soc/sof/sof-audio.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 15c36a51f89f..88ddd1e2476d 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -626,10 +626,13 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify)
 		/* update DAI config. The IPC will be sent in sof_widget_setup() */
 		if (WIDGET_IS_DAI(swidget->id)) {
 			struct snd_sof_dai *dai = swidget->private;
-			struct sof_dai_private_data *private = dai->private;
+			struct sof_dai_private_data *private;
 			struct sof_ipc_dai_config *config;
 
-			if (!dai || !private || !private->dai_config)
+			if (!dai)
+				continue;
+			private = dai->private;
+			if (!private || !private->dai_config)
 				continue;
 
 			config = private->dai_config;
@@ -918,10 +921,13 @@ static int sof_dai_get_clk(struct snd_soc_pcm_runtime *rtd, int clk_type)
 		snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);
 	struct snd_sof_dai *dai =
 		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
-	struct sof_dai_private_data *private = dai->private;
+	struct sof_dai_private_data *private;
 
 	/* use the tplg configured mclk if existed */
-	if (!dai || !private || !private->dai_config)
+	if (!dai)
+		return 0;
+	private = dai->private;
+	if (!private || !private->dai_config)
 		return 0;
 
 	switch (private->dai_config->type) {
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH 2/2] ASoC: SOF: check for NULL before dereferencing
@ 2022-03-18  7:13   ` Dan Carpenter
  0 siblings, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2022-03-18  7:13 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Ranjani Sridharan
  Cc: alsa-devel, Kai Vehmanen, kernel-janitors, Bard Liao,
	Péter Ujfalusi, Takashi Iwai, Liam Girdwood, Mark Brown,
	Daniel Baluta, sound-open-firmware

This code dereferences "dai" before checking whether it can be NULL.

Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 sound/soc/sof/sof-audio.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 15c36a51f89f..88ddd1e2476d 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -626,10 +626,13 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify)
 		/* update DAI config. The IPC will be sent in sof_widget_setup() */
 		if (WIDGET_IS_DAI(swidget->id)) {
 			struct snd_sof_dai *dai = swidget->private;
-			struct sof_dai_private_data *private = dai->private;
+			struct sof_dai_private_data *private;
 			struct sof_ipc_dai_config *config;
 
-			if (!dai || !private || !private->dai_config)
+			if (!dai)
+				continue;
+			private = dai->private;
+			if (!private || !private->dai_config)
 				continue;
 
 			config = private->dai_config;
@@ -918,10 +921,13 @@ static int sof_dai_get_clk(struct snd_soc_pcm_runtime *rtd, int clk_type)
 		snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);
 	struct snd_sof_dai *dai =
 		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
-	struct sof_dai_private_data *private = dai->private;
+	struct sof_dai_private_data *private;
 
 	/* use the tplg configured mclk if existed */
-	if (!dai || !private || !private->dai_config)
+	if (!dai)
+		return 0;
+	private = dai->private;
+	if (!private || !private->dai_config)
 		return 0;
 
 	switch (private->dai_config->type) {
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
  2022-03-18  7:12 ` Dan Carpenter
@ 2022-03-18 14:42   ` Pierre-Louis Bossart
  -1 siblings, 0 replies; 13+ messages in thread
From: Pierre-Louis Bossart @ 2022-03-18 14:42 UTC (permalink / raw)
  To: Dan Carpenter, Ranjani Sridharan
  Cc: alsa-devel, Kai Vehmanen, Péter Ujfalusi, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Bard Liao,
	Daniel Baluta, sound-open-firmware



On 3/18/22 02:12, Dan Carpenter wrote:
> The "dia" pointer can be NULL, so handle that condition first before
> storing "dia->private".
> 
> Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks for the patch.

This part will be removed in follow-up patches, likely the reason why 
this problem was missed.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/sof/pcm.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
> index 1661b0bc6f12..71f5bce0c4c7 100644
> --- a/sound/soc/sof/pcm.c
> +++ b/sound/soc/sof/pcm.c
> @@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
>   	struct snd_sof_dai *dai =
>   		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
>   	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
> -	struct sof_dai_private_data *private = dai->private;
> +	struct sof_dai_private_data *private;
>   	struct snd_soc_dpcm *dpcm;
>   
>   	/* no topology exists for this BE, try a common configuration */
> @@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
>   	/* read format from topology */
>   	snd_mask_none(fmt);
>   
> +	private = dai->private;
>   	switch (private->comp_dai->config.frame_fmt) {
>   	case SOF_IPC_FRAME_S16_LE:
>   		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);

^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
@ 2022-03-18 14:42   ` Pierre-Louis Bossart
  0 siblings, 0 replies; 13+ messages in thread
From: Pierre-Louis Bossart @ 2022-03-18 14:42 UTC (permalink / raw)
  To: Dan Carpenter, Ranjani Sridharan
  Cc: Daniel Baluta, alsa-devel, Kai Vehmanen, Bard Liao,
	kernel-janitors, Takashi Iwai, Liam Girdwood, Mark Brown,
	Péter Ujfalusi, sound-open-firmware



On 3/18/22 02:12, Dan Carpenter wrote:
> The "dia" pointer can be NULL, so handle that condition first before
> storing "dia->private".
> 
> Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks for the patch.

This part will be removed in follow-up patches, likely the reason why 
this problem was missed.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/sof/pcm.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
> index 1661b0bc6f12..71f5bce0c4c7 100644
> --- a/sound/soc/sof/pcm.c
> +++ b/sound/soc/sof/pcm.c
> @@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
>   	struct snd_sof_dai *dai =
>   		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
>   	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
> -	struct sof_dai_private_data *private = dai->private;
> +	struct sof_dai_private_data *private;
>   	struct snd_soc_dpcm *dpcm;
>   
>   	/* no topology exists for this BE, try a common configuration */
> @@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
>   	/* read format from topology */
>   	snd_mask_none(fmt);
>   
> +	private = dai->private;
>   	switch (private->comp_dai->config.frame_fmt) {
>   	case SOF_IPC_FRAME_S16_LE:
>   		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);

^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 2/2] ASoC: SOF: check for NULL before dereferencing
  2022-03-18  7:13   ` Dan Carpenter
@ 2022-03-18 14:51     ` Pierre-Louis Bossart
  -1 siblings, 0 replies; 13+ messages in thread
From: Pierre-Louis Bossart @ 2022-03-18 14:51 UTC (permalink / raw)
  To: Dan Carpenter, Ranjani Sridharan
  Cc: alsa-devel, Kai Vehmanen, kernel-janitors, Bard Liao,
	Péter Ujfalusi, Takashi Iwai, Liam Girdwood, Mark Brown,
	Daniel Baluta, sound-open-firmware



On 3/18/22 02:13, Dan Carpenter wrote:
> This code dereferences "dai" before checking whether it can be NULL.
> 
> Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Same thing, this code will be removed in follow-up patches and we missed 
the intermediate error. Thanks for the patch.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/sof/sof-audio.c | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
> index 15c36a51f89f..88ddd1e2476d 100644
> --- a/sound/soc/sof/sof-audio.c
> +++ b/sound/soc/sof/sof-audio.c
> @@ -626,10 +626,13 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify)
>   		/* update DAI config. The IPC will be sent in sof_widget_setup() */
>   		if (WIDGET_IS_DAI(swidget->id)) {
>   			struct snd_sof_dai *dai = swidget->private;
> -			struct sof_dai_private_data *private = dai->private;
> +			struct sof_dai_private_data *private;
>   			struct sof_ipc_dai_config *config;
>   
> -			if (!dai || !private || !private->dai_config)
> +			if (!dai)
> +				continue;
> +			private = dai->private;
> +			if (!private || !private->dai_config)
>   				continue;
>   
>   			config = private->dai_config;
> @@ -918,10 +921,13 @@ static int sof_dai_get_clk(struct snd_soc_pcm_runtime *rtd, int clk_type)
>   		snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);
>   	struct snd_sof_dai *dai =
>   		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
> -	struct sof_dai_private_data *private = dai->private;
> +	struct sof_dai_private_data *private;
>   
>   	/* use the tplg configured mclk if existed */
> -	if (!dai || !private || !private->dai_config)
> +	if (!dai)
> +		return 0;
> +	private = dai->private;
> +	if (!private || !private->dai_config)
>   		return 0;
>   
>   	switch (private->dai_config->type) {

^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 2/2] ASoC: SOF: check for NULL before dereferencing
@ 2022-03-18 14:51     ` Pierre-Louis Bossart
  0 siblings, 0 replies; 13+ messages in thread
From: Pierre-Louis Bossart @ 2022-03-18 14:51 UTC (permalink / raw)
  To: Dan Carpenter, Ranjani Sridharan
  Cc: Daniel Baluta, alsa-devel, Kai Vehmanen, Péter Ujfalusi,
	kernel-janitors, Takashi Iwai, Liam Girdwood, Mark Brown,
	Bard Liao, sound-open-firmware



On 3/18/22 02:13, Dan Carpenter wrote:
> This code dereferences "dai" before checking whether it can be NULL.
> 
> Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Same thing, this code will be removed in follow-up patches and we missed 
the intermediate error. Thanks for the patch.

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/sof/sof-audio.c | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
> index 15c36a51f89f..88ddd1e2476d 100644
> --- a/sound/soc/sof/sof-audio.c
> +++ b/sound/soc/sof/sof-audio.c
> @@ -626,10 +626,13 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify)
>   		/* update DAI config. The IPC will be sent in sof_widget_setup() */
>   		if (WIDGET_IS_DAI(swidget->id)) {
>   			struct snd_sof_dai *dai = swidget->private;
> -			struct sof_dai_private_data *private = dai->private;
> +			struct sof_dai_private_data *private;
>   			struct sof_ipc_dai_config *config;
>   
> -			if (!dai || !private || !private->dai_config)
> +			if (!dai)
> +				continue;
> +			private = dai->private;
> +			if (!private || !private->dai_config)
>   				continue;
>   
>   			config = private->dai_config;
> @@ -918,10 +921,13 @@ static int sof_dai_get_clk(struct snd_soc_pcm_runtime *rtd, int clk_type)
>   		snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);
>   	struct snd_sof_dai *dai =
>   		snd_sof_find_dai(component, (char *)rtd->dai_link->name);
> -	struct sof_dai_private_data *private = dai->private;
> +	struct sof_dai_private_data *private;
>   
>   	/* use the tplg configured mclk if existed */
> -	if (!dai || !private || !private->dai_config)
> +	if (!dai)
> +		return 0;
> +	private = dai->private;
> +	if (!private || !private->dai_config)
>   		return 0;
>   
>   	switch (private->dai_config->type) {

^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
  2022-03-18 14:42   ` Pierre-Louis Bossart
@ 2022-03-18 16:14     ` Ranjani Sridharan
  -1 siblings, 0 replies; 13+ messages in thread
From: Ranjani Sridharan @ 2022-03-18 16:14 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Dan Carpenter
  Cc: Daniel Baluta, alsa-devel, Kai Vehmanen, Bard Liao,
	kernel-janitors, Takashi Iwai, Liam Girdwood, Mark Brown,
	Péter Ujfalusi, sound-open-firmware

On Fri, 2022-03-18 at 09:42 -0500, Pierre-Louis Bossart wrote:
> 
> On 3/18/22 02:12, Dan Carpenter wrote:
> > The "dia" pointer can be NULL, so handle that condition first
> > before
> > storing "dia->private".
> > 
> > Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC
> > agnostic")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Thanks for the patch.
> 
> This part will be removed in follow-up patches, likely the reason
> why 
> this problem was missed.

Hi Dan/Pierre,

Both these problems are address in the series I posted yesterday.
Particularly patches 16 and 18.

Thanks,
Ranjani
> 
> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> 
> > ---
> >   sound/soc/sof/pcm.c | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
> > index 1661b0bc6f12..71f5bce0c4c7 100644
> > --- a/sound/soc/sof/pcm.c
> > +++ b/sound/soc/sof/pcm.c
> > @@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct
> > snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
> >   	struct snd_sof_dai *dai =
> >   		snd_sof_find_dai(component, (char *)rtd->dai_link-
> > >name);
> >   	struct snd_sof_dev *sdev =
> > snd_soc_component_get_drvdata(component);
> > -	struct sof_dai_private_data *private = dai->private;
> > +	struct sof_dai_private_data *private;
> >   	struct snd_soc_dpcm *dpcm;
> >   
> >   	/* no topology exists for this BE, try a common configuration
> > */
> > @@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct
> > snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
> >   	/* read format from topology */
> >   	snd_mask_none(fmt);
> >   
> > +	private = dai->private;
> >   	switch (private->comp_dai->config.frame_fmt) {
> >   	case SOF_IPC_FRAME_S16_LE:
> >   		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);


^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
@ 2022-03-18 16:14     ` Ranjani Sridharan
  0 siblings, 0 replies; 13+ messages in thread
From: Ranjani Sridharan @ 2022-03-18 16:14 UTC (permalink / raw)
  To: Pierre-Louis Bossart, Dan Carpenter
  Cc: alsa-devel, Kai Vehmanen, Daniel Baluta, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Péter Ujfalusi,
	Bard Liao, sound-open-firmware

On Fri, 2022-03-18 at 09:42 -0500, Pierre-Louis Bossart wrote:
> 
> On 3/18/22 02:12, Dan Carpenter wrote:
> > The "dia" pointer can be NULL, so handle that condition first
> > before
> > storing "dia->private".
> > 
> > Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC
> > agnostic")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Thanks for the patch.
> 
> This part will be removed in follow-up patches, likely the reason
> why 
> this problem was missed.

Hi Dan/Pierre,

Both these problems are address in the series I posted yesterday.
Particularly patches 16 and 18.

Thanks,
Ranjani
> 
> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> 
> > ---
> >   sound/soc/sof/pcm.c | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
> > index 1661b0bc6f12..71f5bce0c4c7 100644
> > --- a/sound/soc/sof/pcm.c
> > +++ b/sound/soc/sof/pcm.c
> > @@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct
> > snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
> >   	struct snd_sof_dai *dai =
> >   		snd_sof_find_dai(component, (char *)rtd->dai_link-
> > >name);
> >   	struct snd_sof_dev *sdev =
> > snd_soc_component_get_drvdata(component);
> > -	struct sof_dai_private_data *private = dai->private;
> > +	struct sof_dai_private_data *private;
> >   	struct snd_soc_dpcm *dpcm;
> >   
> >   	/* no topology exists for this BE, try a common configuration
> > */
> > @@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct
> > snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
> >   	/* read format from topology */
> >   	snd_mask_none(fmt);
> >   
> > +	private = dai->private;
> >   	switch (private->comp_dai->config.frame_fmt) {
> >   	case SOF_IPC_FRAME_S16_LE:
> >   		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);


^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
  2022-03-18 16:14     ` Ranjani Sridharan
@ 2022-03-18 17:49       ` Mark Brown
  -1 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2022-03-18 17:49 UTC (permalink / raw)
  To: Ranjani Sridharan
  Cc: Pierre-Louis Bossart, Dan Carpenter, Daniel Baluta, alsa-devel,
	Kai Vehmanen, Bard Liao, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Péter Ujfalusi, sound-open-firmware

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

On Fri, Mar 18, 2022 at 09:14:55AM -0700, Ranjani Sridharan wrote:
> On Fri, 2022-03-18 at 09:42 -0500, Pierre-Louis Bossart wrote:

> > This part will be removed in follow-up patches, likely the reason
> > why 
> > this problem was missed.

> Both these problems are address in the series I posted yesterday.
> Particularly patches 16 and 18.

OK, I've got that patch series queued already so I'll skip these for
now.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
@ 2022-03-18 17:49       ` Mark Brown
  0 siblings, 0 replies; 13+ messages in thread
From: Mark Brown @ 2022-03-18 17:49 UTC (permalink / raw)
  To: Ranjani Sridharan
  Cc: alsa-devel, Kai Vehmanen, Liam Girdwood, Daniel Baluta,
	kernel-janitors, Pierre-Louis Bossart, Takashi Iwai,
	Péter Ujfalusi, Bard Liao, Dan Carpenter,
	sound-open-firmware

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

On Fri, Mar 18, 2022 at 09:14:55AM -0700, Ranjani Sridharan wrote:
> On Fri, 2022-03-18 at 09:42 -0500, Pierre-Louis Bossart wrote:

> > This part will be removed in follow-up patches, likely the reason
> > why 
> > this problem was missed.

> Both these problems are address in the series I posted yesterday.
> Particularly patches 16 and 18.

OK, I've got that patch series queued already so I'll skip these for
now.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread
* Re: [Sound-open-firmware] [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup()
  2022-03-18  7:12 ` Dan Carpenter
                   ` (2 preceding siblings ...)
  (?)
@ 2022-03-20 14:33 ` Curtis Malainey
  -1 siblings, 0 replies; 13+ messages in thread
From: Curtis Malainey @ 2022-03-20 14:33 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Daniel Baluta, ALSA development, Kai Vehmanen, Liam Girdwood,
	Bard Liao, Takashi Iwai, kernel-janitors, Pierre-Louis Bossart,
	Ranjani Sridharan, Mark Brown, Péter Ujfalusi,
	Sound Open Firmware

On Sun, Mar 20, 2022, 12:10 AM Dan Carpenter <dan.carpenter@oracle.com>
wrote:

> The "dia" pointer can be NULL, so handle that condition first before
> storing "dia->private".
>

Typo in commit message, it is DAI in code, not dia.


> Fixes: 839e484f9e17 ("ASoC: SOF: make struct snd_sof_dai IPC agnostic")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  sound/soc/sof/pcm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
> index 1661b0bc6f12..71f5bce0c4c7 100644
> --- a/sound/soc/sof/pcm.c
> +++ b/sound/soc/sof/pcm.c
> @@ -702,7 +702,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime
> *rtd, struct snd_pcm_hw_pa
>         struct snd_sof_dai *dai =
>                 snd_sof_find_dai(component, (char *)rtd->dai_link->name);
>         struct snd_sof_dev *sdev =
> snd_soc_component_get_drvdata(component);
> -       struct sof_dai_private_data *private = dai->private;
> +       struct sof_dai_private_data *private;
>         struct snd_soc_dpcm *dpcm;
>
>         /* no topology exists for this BE, try a common configuration */
> @@ -727,6 +727,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime
> *rtd, struct snd_pcm_hw_pa
>         /* read format from topology */
>         snd_mask_none(fmt);
>
> +       private = dai->private;
>         switch (private->comp_dai->config.frame_fmt) {
>         case SOF_IPC_FRAME_S16_LE:
>                 snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE);
> --
> 2.20.1
>
> _______________________________________________
> Sound-open-firmware mailing list
> Sound-open-firmware@alsa-project.org
> https://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
>

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-03-20 14:34 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-18  7:12 [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup() Dan Carpenter
2022-03-18  7:12 ` Dan Carpenter
2022-03-18  7:13 ` [PATCH 2/2] ASoC: SOF: check for NULL before dereferencing Dan Carpenter
2022-03-18  7:13   ` Dan Carpenter
2022-03-18 14:51   ` Pierre-Louis Bossart
2022-03-18 14:51     ` Pierre-Louis Bossart
2022-03-18 14:42 ` [PATCH 1/2] ASoC: SOF: Prevent NULL dereference in sof_pcm_dai_link_fixup() Pierre-Louis Bossart
2022-03-18 14:42   ` Pierre-Louis Bossart
2022-03-18 16:14   ` Ranjani Sridharan
2022-03-18 16:14     ` Ranjani Sridharan
2022-03-18 17:49     ` Mark Brown
2022-03-18 17:49       ` Mark Brown
2022-03-20 14:33 ` [Sound-open-firmware] " Curtis Malainey

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.