All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs
@ 2018-06-27  8:56 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2018-06-27  8:56 UTC (permalink / raw)
  To: Patrick Lai, Srinivas Kandagatla
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown

The > should be >= or we could read one element beyond the end of the
port_maps[] array.

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

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 01f43218984b..69a7896cb713 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -777,7 +777,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
  */
 int q6afe_get_port_id(int index)
 {
-	if (index < 0 || index > AFE_PORT_MAX)
+	if (index < 0 || index >= AFE_PORT_MAX)
 		return -EINVAL;
 
 	return port_maps[index].port_id;
@@ -1014,7 +1014,7 @@ int q6afe_port_stop(struct q6afe_port *port)
 
 	port_id = port->id;
 	index = port->token;
-	if (index < 0 || index > AFE_PORT_MAX) {
+	if (index < 0 || index >= AFE_PORT_MAX) {
 		dev_err(afe->dev, "AFE port index[%d] invalid!\n", index);
 		return -EINVAL;
 	}
@@ -1355,7 +1355,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
 	unsigned long flags;
 	int cfg_type;
 
-	if (id < 0 || id > AFE_PORT_MAX) {
+	if (id < 0 || id >= AFE_PORT_MAX) {
 		dev_err(dev, "AFE port token[%d] invalid!\n", id);
 		return ERR_PTR(-EINVAL);
 	}

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs
@ 2018-06-27  8:56 ` Dan Carpenter
  0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2018-06-27  8:56 UTC (permalink / raw)
  To: Patrick Lai, Srinivas Kandagatla
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown

The > should be >= or we could read one element beyond the end of the
port_maps[] array.

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

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 01f43218984b..69a7896cb713 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -777,7 +777,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
  */
 int q6afe_get_port_id(int index)
 {
-	if (index < 0 || index > AFE_PORT_MAX)
+	if (index < 0 || index >= AFE_PORT_MAX)
 		return -EINVAL;
 
 	return port_maps[index].port_id;
@@ -1014,7 +1014,7 @@ int q6afe_port_stop(struct q6afe_port *port)
 
 	port_id = port->id;
 	index = port->token;
-	if (index < 0 || index > AFE_PORT_MAX) {
+	if (index < 0 || index >= AFE_PORT_MAX) {
 		dev_err(afe->dev, "AFE port index[%d] invalid!\n", index);
 		return -EINVAL;
 	}
@@ -1355,7 +1355,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
 	unsigned long flags;
 	int cfg_type;
 
-	if (id < 0 || id > AFE_PORT_MAX) {
+	if (id < 0 || id >= AFE_PORT_MAX) {
 		dev_err(dev, "AFE port token[%d] invalid!\n", id);
 		return ERR_PTR(-EINVAL);
 	}

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs
  2018-06-27  8:56 ` Dan Carpenter
@ 2018-06-28  8:36   ` Srinivas Kandagatla
  -1 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2018-06-28  8:36 UTC (permalink / raw)
  To: Dan Carpenter, Patrick Lai
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown

Thanks for the patch,

On 27/06/18 09:56, Dan Carpenter wrote:
> The > should be >= or we could read one element beyond the end of the
> port_maps[] array.
> 
> Fixes: 7fa2d70f9766 ("ASoC: qdsp6: q6afe: Add q6afe driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 

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

> diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
> index 01f43218984b..69a7896cb713 100644
> --- a/sound/soc/qcom/qdsp6/q6afe.c
> +++ b/sound/soc/qcom/qdsp6/q6afe.c
> @@ -777,7 +777,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
>    */
>   int q6afe_get_port_id(int index)
>   {
> -	if (index < 0 || index > AFE_PORT_MAX)
> +	if (index < 0 || index >= AFE_PORT_MAX)
>   		return -EINVAL;
>   
>   	return port_maps[index].port_id;
> @@ -1014,7 +1014,7 @@ int q6afe_port_stop(struct q6afe_port *port)
>   
>   	port_id = port->id;
>   	index = port->token;
> -	if (index < 0 || index > AFE_PORT_MAX) {
> +	if (index < 0 || index >= AFE_PORT_MAX) {
>   		dev_err(afe->dev, "AFE port index[%d] invalid!\n", index);
>   		return -EINVAL;
>   	}
> @@ -1355,7 +1355,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
>   	unsigned long flags;
>   	int cfg_type;
>   
> -	if (id < 0 || id > AFE_PORT_MAX) {
> +	if (id < 0 || id >= AFE_PORT_MAX) {
>   		dev_err(dev, "AFE port token[%d] invalid!\n", id);
>   		return ERR_PTR(-EINVAL);
>   	}
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs
@ 2018-06-28  8:36   ` Srinivas Kandagatla
  0 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2018-06-28  8:36 UTC (permalink / raw)
  To: Dan Carpenter, Patrick Lai
  Cc: alsa-devel, Banajit Goswami, kernel-janitors, Takashi Iwai,
	Liam Girdwood, Mark Brown

Thanks for the patch,

On 27/06/18 09:56, Dan Carpenter wrote:
> The > should be >= or we could read one element beyond the end of the
> port_maps[] array.
> 
> Fixes: 7fa2d70f9766 ("ASoC: qdsp6: q6afe: Add q6afe driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 

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

> diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
> index 01f43218984b..69a7896cb713 100644
> --- a/sound/soc/qcom/qdsp6/q6afe.c
> +++ b/sound/soc/qcom/qdsp6/q6afe.c
> @@ -777,7 +777,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
>    */
>   int q6afe_get_port_id(int index)
>   {
> -	if (index < 0 || index > AFE_PORT_MAX)
> +	if (index < 0 || index >= AFE_PORT_MAX)
>   		return -EINVAL;
>   
>   	return port_maps[index].port_id;
> @@ -1014,7 +1014,7 @@ int q6afe_port_stop(struct q6afe_port *port)
>   
>   	port_id = port->id;
>   	index = port->token;
> -	if (index < 0 || index > AFE_PORT_MAX) {
> +	if (index < 0 || index >= AFE_PORT_MAX) {
>   		dev_err(afe->dev, "AFE port index[%d] invalid!\n", index);
>   		return -EINVAL;
>   	}
> @@ -1355,7 +1355,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
>   	unsigned long flags;
>   	int cfg_type;
>   
> -	if (id < 0 || id > AFE_PORT_MAX) {
> +	if (id < 0 || id >= AFE_PORT_MAX) {
>   		dev_err(dev, "AFE port token[%d] invalid!\n", id);
>   		return ERR_PTR(-EINVAL);
>   	}
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Applied "ASoC: qdsp6: qdafe: fix some off by one bugs" to the asoc tree
  2018-06-27  8:56 ` Dan Carpenter
@ 2018-06-28 10:20   ` Mark Brown
  -1 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2018-06-28 10:20 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: alsa-devel, Banajit Goswami, Patrick Lai, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Srinivas Kandagatla

The patch

   ASoC: qdsp6: qdafe: fix some off by one bugs

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 c54c1c5ee8e73b7cb752834e52e2129b1dab00bd Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 27 Jun 2018 11:56:53 +0300
Subject: [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs

The > should be >= or we could read one element beyond the end of the
port_maps[] array.

Fixes: 7fa2d70f9766 ("ASoC: qdsp6: q6afe: Add q6afe driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6afe.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 621b67b34db9..671743453fbb 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -776,7 +776,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
  */
 int q6afe_get_port_id(int index)
 {
-	if (index < 0 || index > AFE_PORT_MAX)
+	if (index < 0 || index >= AFE_PORT_MAX)
 		return -EINVAL;
 
 	return port_maps[index].port_id;
@@ -1013,7 +1013,7 @@ int q6afe_port_stop(struct q6afe_port *port)
 
 	port_id = port->id;
 	index = port->token;
-	if (index < 0 || index > AFE_PORT_MAX) {
+	if (index < 0 || index >= AFE_PORT_MAX) {
 		dev_err(afe->dev, "AFE port index[%d] invalid!\n", index);
 		return -EINVAL;
 	}
@@ -1354,7 +1354,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
 	unsigned long flags;
 	int cfg_type;
 
-	if (id < 0 || id > AFE_PORT_MAX) {
+	if (id < 0 || id >= AFE_PORT_MAX) {
 		dev_err(dev, "AFE port token[%d] invalid!\n", id);
 		return ERR_PTR(-EINVAL);
 	}
-- 
2.18.0.rc2


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Applied "ASoC: qdsp6: qdafe: fix some off by one bugs" to the asoc tree
@ 2018-06-28 10:20   ` Mark Brown
  0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2018-06-28 10:20 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: alsa-devel, Banajit Goswami, Patrick Lai, kernel-janitors,
	Takashi Iwai, Liam Girdwood, Mark Brown, Srinivas Kandagatla

The patch

   ASoC: qdsp6: qdafe: fix some off by one bugs

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 c54c1c5ee8e73b7cb752834e52e2129b1dab00bd Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 27 Jun 2018 11:56:53 +0300
Subject: [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs

The > should be >= or we could read one element beyond the end of the
port_maps[] array.

Fixes: 7fa2d70f9766 ("ASoC: qdsp6: q6afe: Add q6afe driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6afe.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 621b67b34db9..671743453fbb 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -776,7 +776,7 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
  */
 int q6afe_get_port_id(int index)
 {
-	if (index < 0 || index > AFE_PORT_MAX)
+	if (index < 0 || index >= AFE_PORT_MAX)
 		return -EINVAL;
 
 	return port_maps[index].port_id;
@@ -1013,7 +1013,7 @@ int q6afe_port_stop(struct q6afe_port *port)
 
 	port_id = port->id;
 	index = port->token;
-	if (index < 0 || index > AFE_PORT_MAX) {
+	if (index < 0 || index >= AFE_PORT_MAX) {
 		dev_err(afe->dev, "AFE port index[%d] invalid!\n", index);
 		return -EINVAL;
 	}
@@ -1354,7 +1354,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
 	unsigned long flags;
 	int cfg_type;
 
-	if (id < 0 || id > AFE_PORT_MAX) {
+	if (id < 0 || id >= AFE_PORT_MAX) {
 		dev_err(dev, "AFE port token[%d] invalid!\n", id);
 		return ERR_PTR(-EINVAL);
 	}
-- 
2.18.0.rc2

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-28 10:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-27  8:56 [PATCH] ASoC: qdsp6: qdafe: fix some off by one bugs Dan Carpenter
2018-06-27  8:56 ` Dan Carpenter
2018-06-28  8:36 ` Srinivas Kandagatla
2018-06-28  8:36   ` Srinivas Kandagatla
2018-06-28 10:20 ` Applied "ASoC: qdsp6: qdafe: fix some off by one bugs" to the asoc tree Mark Brown
2018-06-28 10:20   ` Mark Brown

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.