All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params()
@ 2018-07-13 15:11 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2018-07-13 15:11 UTC (permalink / raw)
  To: Patrick Lai, Srinivas Kandagatla
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown, Niklas Cassel

The data->port_data[] array has AFE_MAX_PORTS elements so the check
should be >= instead of > or we write one element beyond the end of the
array.

Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index 35269b492761..0e7cf9e35d51 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -927,7 +927,7 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
 	else
 		path_type = ADM_PATH_LIVE_REC;
 
-	if (be_id > AFE_MAX_PORTS)
+	if (be_id >= AFE_MAX_PORTS)
 		return -EINVAL;
 
 	session = &data->port_data[be_id];

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params()
@ 2018-07-13 15:11 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2018-07-13 15:11 UTC (permalink / raw)
  To: Patrick Lai, Srinivas Kandagatla
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown, Niklas Cassel

The data->port_data[] array has AFE_MAX_PORTS elements so the check
should be >= instead of > or we write one element beyond the end of the
array.

Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index 35269b492761..0e7cf9e35d51 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -927,7 +927,7 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
 	else
 		path_type = ADM_PATH_LIVE_REC;
 
-	if (be_id > AFE_MAX_PORTS)
+	if (be_id >= AFE_MAX_PORTS)
 		return -EINVAL;
 
 	session = &data->port_data[be_id];

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Applied "ASoC: qdsp6: q6routing: off by one in routing_hw_params()" to the asoc tree
  2018-07-13 15:11 ` Dan Carpenter
@ 2018-07-13 15:30   ` Mark Brown
  -1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2018-07-13 15:30 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: alsa-devel, Banajit Goswami, Patrick Lai, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Srinivas Kandagatla,
	Niklas Cassel

The patch

   ASoC: qdsp6: q6routing: off by one in routing_hw_params()

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 090345ce7265dd111299e3a63cdc79c3ef924481 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 13 Jul 2018 18:11:04 +0300
Subject: [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params()

The data->port_data[] array has AFE_MAX_PORTS elements so the check
should be >= instead of > or we write one element beyond the end of the
array.

Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6routing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index 593f66b8622f..7a19d6278406 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -899,7 +899,7 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
 	else
 		path_type = ADM_PATH_LIVE_REC;
 
-	if (be_id > AFE_MAX_PORTS)
+	if (be_id >= AFE_MAX_PORTS)
 		return -EINVAL;
 
 	session = &data->port_data[be_id];
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Applied "ASoC: qdsp6: q6routing: off by one in routing_hw_params()" to the asoc tree
@ 2018-07-13 15:30   ` Mark Brown
  0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2018-07-13 15:30 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: alsa-devel, Banajit Goswami, Patrick Lai, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Srinivas Kandagatla,
	Niklas Cassel

The patch

   ASoC: qdsp6: q6routing: off by one in routing_hw_params()

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 090345ce7265dd111299e3a63cdc79c3ef924481 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 13 Jul 2018 18:11:04 +0300
Subject: [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params()

The data->port_data[] array has AFE_MAX_PORTS elements so the check
should be >= instead of > or we write one element beyond the end of the
array.

Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6routing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index 593f66b8622f..7a19d6278406 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -899,7 +899,7 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
 	else
 		path_type = ADM_PATH_LIVE_REC;
 
-	if (be_id > AFE_MAX_PORTS)
+	if (be_id >= AFE_MAX_PORTS)
 		return -EINVAL;
 
 	session = &data->port_data[be_id];
-- 
2.18.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params()
  2018-07-13 15:11 ` Dan Carpenter
@ 2018-07-13 15:42   ` Srinivas Kandagatla
  -1 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2018-07-13 15:42 UTC (permalink / raw)
  To: Dan Carpenter, Patrick Lai
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown, Niklas Cassel



On 13/07/18 16:11, Dan Carpenter wrote:
> The data->port_data[] array has AFE_MAX_PORTS elements so the check
> should be >= instead of > or we write one element beyond the end of the
> array.
> 
> Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks for the fix,

Acked-by: Srinivas Kandgatla <srinivas.kandagatla@linaro.org>

> 
> diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
> index 35269b492761..0e7cf9e35d51 100644
> --- a/sound/soc/qcom/qdsp6/q6routing.c
> +++ b/sound/soc/qcom/qdsp6/q6routing.c
> @@ -927,7 +927,7 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
>   	else
>   		path_type = ADM_PATH_LIVE_REC;
>   
> -	if (be_id > AFE_MAX_PORTS)
> +	if (be_id >= AFE_MAX_PORTS)
>   		return -EINVAL;
>   
>   	session = &data->port_data[be_id];
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params()
@ 2018-07-13 15:42   ` Srinivas Kandagatla
  0 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2018-07-13 15:42 UTC (permalink / raw)
  To: Dan Carpenter, Patrick Lai
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown, Niklas Cassel



On 13/07/18 16:11, Dan Carpenter wrote:
> The data->port_data[] array has AFE_MAX_PORTS elements so the check
> should be >= instead of > or we write one element beyond the end of the
> array.
> 
> Fixes: e3a33673e845 ("ASoC: qdsp6: q6routing: Add q6routing driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks for the fix,

Acked-by: Srinivas Kandgatla <srinivas.kandagatla@linaro.org>

> 
> diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
> index 35269b492761..0e7cf9e35d51 100644
> --- a/sound/soc/qcom/qdsp6/q6routing.c
> +++ b/sound/soc/qcom/qdsp6/q6routing.c
> @@ -927,7 +927,7 @@ static int routing_hw_params(struct snd_pcm_substream *substream,
>   	else
>   		path_type = ADM_PATH_LIVE_REC;
>   
> -	if (be_id > AFE_MAX_PORTS)
> +	if (be_id >= AFE_MAX_PORTS)
>   		return -EINVAL;
>   
>   	session = &data->port_data[be_id];
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-07-14 22:44 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-13 15:11 [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params() Dan Carpenter
2018-07-13 15:11 ` Dan Carpenter
2018-07-13 15:30 ` Applied "ASoC: qdsp6: q6routing: off by one in routing_hw_params()" to the asoc tree Mark Brown
2018-07-13 15:30   ` Mark Brown
2018-07-13 15:42 ` [PATCH] ASoC: qdsp6: q6routing: off by one in routing_hw_params() Srinivas Kandagatla
2018-07-13 15:42   ` Srinivas Kandagatla

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.