* [PATCH] soundwire: qcom: handle return correctly in qcom_swrm_transport_params
@ 2021-04-01 9:15 Srinivas Kandagatla
2021-04-01 20:43 ` Kees Cook
2021-04-06 4:55 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Srinivas Kandagatla @ 2021-04-01 9:15 UTC (permalink / raw)
To: vkoul
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale, alsa-devel,
linux-kernel, robh, devicetree, Srinivas Kandagatla,
coverity-bot
Looks like return from reg_write is set but not checked.
Fix this by adding error return path.
Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
Addresses-Coverity-ID: 1503591 ("UNUSED_VALUE")
Fixes: 128eaf937adb ("soundwire: qcom: add support to missing transport params")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/soundwire/qcom.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 5fd4a99cc8ac..348d9a46f850 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -731,17 +731,23 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus,
value |= pcfg->si;
ret = ctrl->reg_write(ctrl, reg, value);
+ if (ret)
+ goto err;
if (pcfg->lane_control != SWR_INVALID_PARAM) {
reg = SWRM_DP_PORT_CTRL_2_BANK(params->port_num, bank);
value = pcfg->lane_control;
ret = ctrl->reg_write(ctrl, reg, value);
+ if (ret)
+ goto err;
}
if (pcfg->blk_group_count != SWR_INVALID_PARAM) {
reg = SWRM_DP_BLOCK_CTRL2_BANK(params->port_num, bank);
value = pcfg->blk_group_count;
ret = ctrl->reg_write(ctrl, reg, value);
+ if (ret)
+ goto err;
}
if (pcfg->hstart != SWR_INVALID_PARAM
@@ -755,11 +761,15 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus,
ret = ctrl->reg_write(ctrl, reg, value);
}
+ if (ret)
+ goto err;
+
if (pcfg->bp_mode != SWR_INVALID_PARAM) {
reg = SWRM_DP_BLOCK_CTRL3_BANK(params->port_num, bank);
ret = ctrl->reg_write(ctrl, reg, pcfg->bp_mode);
}
+err:
return ret;
}
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] soundwire: qcom: handle return correctly in qcom_swrm_transport_params
2021-04-01 9:15 [PATCH] soundwire: qcom: handle return correctly in qcom_swrm_transport_params Srinivas Kandagatla
@ 2021-04-01 20:43 ` Kees Cook
2021-04-06 4:55 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2021-04-01 20:43 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: vkoul, yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale,
alsa-devel, linux-kernel, robh, devicetree
On Thu, Apr 01, 2021 at 10:15:02AM +0100, Srinivas Kandagatla wrote:
> Looks like return from reg_write is set but not checked.
> Fix this by adding error return path.
>
> Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
> Addresses-Coverity-ID: 1503591 ("UNUSED_VALUE")
> Fixes: 128eaf937adb ("soundwire: qcom: add support to missing transport params")
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Thanks for fixing this!
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> drivers/soundwire/qcom.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index 5fd4a99cc8ac..348d9a46f850 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -731,17 +731,23 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus,
> value |= pcfg->si;
>
> ret = ctrl->reg_write(ctrl, reg, value);
> + if (ret)
> + goto err;
>
> if (pcfg->lane_control != SWR_INVALID_PARAM) {
> reg = SWRM_DP_PORT_CTRL_2_BANK(params->port_num, bank);
> value = pcfg->lane_control;
> ret = ctrl->reg_write(ctrl, reg, value);
> + if (ret)
> + goto err;
> }
>
> if (pcfg->blk_group_count != SWR_INVALID_PARAM) {
> reg = SWRM_DP_BLOCK_CTRL2_BANK(params->port_num, bank);
> value = pcfg->blk_group_count;
> ret = ctrl->reg_write(ctrl, reg, value);
> + if (ret)
> + goto err;
> }
>
> if (pcfg->hstart != SWR_INVALID_PARAM
> @@ -755,11 +761,15 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus,
> ret = ctrl->reg_write(ctrl, reg, value);
> }
>
> + if (ret)
> + goto err;
> +
> if (pcfg->bp_mode != SWR_INVALID_PARAM) {
> reg = SWRM_DP_BLOCK_CTRL3_BANK(params->port_num, bank);
> ret = ctrl->reg_write(ctrl, reg, pcfg->bp_mode);
> }
>
> +err:
> return ret;
> }
>
> --
> 2.21.0
>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] soundwire: qcom: handle return correctly in qcom_swrm_transport_params
2021-04-01 9:15 [PATCH] soundwire: qcom: handle return correctly in qcom_swrm_transport_params Srinivas Kandagatla
2021-04-01 20:43 ` Kees Cook
@ 2021-04-06 4:55 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2021-04-06 4:55 UTC (permalink / raw)
To: Srinivas Kandagatla
Cc: yung-chuan.liao, pierre-louis.bossart, sanyog.r.kale, alsa-devel,
linux-kernel, robh, devicetree, coverity-bot
On 01-04-21, 10:15, Srinivas Kandagatla wrote:
> Looks like return from reg_write is set but not checked.
> Fix this by adding error return path.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-06 4:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-01 9:15 [PATCH] soundwire: qcom: handle return correctly in qcom_swrm_transport_params Srinivas Kandagatla
2021-04-01 20:43 ` Kees Cook
2021-04-06 4:55 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).