Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1725670 > unrolled thread
| Started by | Colin King <colin.king@canonical.com> |
|---|---|
| First post | 2017-09-03 15:10 +0200 |
| Last post | 2017-09-04 20:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] rpmsg: glink: initialize ret to zero to ensure error status check is correct Colin King <colin.king@canonical.com> - 2017-09-03 15:10 +0200
Re: [PATCH] rpmsg: glink: initialize ret to zero to ensure error status check is correct Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-09-04 20:00 +0200
| From | Colin King <colin.king@canonical.com> |
|---|---|
| Date | 2017-09-03 15:10 +0200 |
| Subject | [PATCH] rpmsg: glink: initialize ret to zero to ensure error status check is correct |
| Message-ID | <ulCP0-mt-3@gated-at.bofh.it> |
From: Colin Ian King <colin.king@canonical.com>
The new switch cases for RPM_CMD_RX_DONE, RPM_CMD_RX_DONE_W_REUSE,
RPM_CMD_RX_INTENT_REQ_ACK, RPM_CMD_INTENT and RPM_CMD_RX_INTENT_REQ from
4 recent commits are not setting ret and so a later non-zero check on ret
is testing on a garbage value in ret. Fix this by initializing ret to zero.
Detected by CoverityScan CID#1455249 ("Uninitialized scalar variable")
Fixes: 933b45da5d1d ("rpmsg: glink: Add support for TX intents)
Fixes: dacbb35e930f ("glink: Receive and store the remote intent buffers")
Fixes: 27b9c5b66b23 ("rpmsg: glink: Request for intents when unavailable")
Fixes: 88c6060f5a7f ("rpmsg: glink: Handle remote rx done command")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/rpmsg/qcom_glink_native.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index 8bc0d0456a40..5a5e927ea50f 100644
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -957,7 +957,7 @@ static irqreturn_t qcom_glink_native_intr(int irq, void *data)
unsigned int param2;
unsigned int avail;
unsigned int cmd;
- int ret;
+ int ret = 0;
for (;;) {
avail = qcom_glink_rx_avail(glink);
@@ -994,8 +994,6 @@ static irqreturn_t qcom_glink_native_intr(int irq, void *data)
mbox_send_message(glink->mbox_chan, NULL);
mbox_client_txdone(glink->mbox_chan, 0);
-
- ret = 0;
break;
case RPM_CMD_INTENT:
qcom_glink_handle_intent(glink, param1, param2, avail);
--
2.14.1
[toc] | [next] | [standalone]
| From | Bjorn Andersson <bjorn.andersson@linaro.org> |
|---|---|
| Date | 2017-09-04 20:00 +0200 |
| Subject | Re: [PATCH] rpmsg: glink: initialize ret to zero to ensure error status check is correct |
| Message-ID | <um3Pc-58-23@gated-at.bofh.it> |
| In reply to | #1725670 |
On Sun 03 Sep 06:06 PDT 2017, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The new switch cases for RPM_CMD_RX_DONE, RPM_CMD_RX_DONE_W_REUSE,
> RPM_CMD_RX_INTENT_REQ_ACK, RPM_CMD_INTENT and RPM_CMD_RX_INTENT_REQ from
> 4 recent commits are not setting ret and so a later non-zero check on ret
> is testing on a garbage value in ret. Fix this by initializing ret to zero.
>
> Detected by CoverityScan CID#1455249 ("Uninitialized scalar variable")
>
> Fixes: 933b45da5d1d ("rpmsg: glink: Add support for TX intents)
> Fixes: dacbb35e930f ("glink: Receive and store the remote intent buffers")
> Fixes: 27b9c5b66b23 ("rpmsg: glink: Request for intents when unavailable")
> Fixes: 88c6060f5a7f ("rpmsg: glink: Handle remote rx done command")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks Colin, applied both patches.
Regards,
Bjorn
> ---
> drivers/rpmsg/qcom_glink_native.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
> index 8bc0d0456a40..5a5e927ea50f 100644
> --- a/drivers/rpmsg/qcom_glink_native.c
> +++ b/drivers/rpmsg/qcom_glink_native.c
> @@ -957,7 +957,7 @@ static irqreturn_t qcom_glink_native_intr(int irq, void *data)
> unsigned int param2;
> unsigned int avail;
> unsigned int cmd;
> - int ret;
> + int ret = 0;
>
> for (;;) {
> avail = qcom_glink_rx_avail(glink);
> @@ -994,8 +994,6 @@ static irqreturn_t qcom_glink_native_intr(int irq, void *data)
>
> mbox_send_message(glink->mbox_chan, NULL);
> mbox_client_txdone(glink->mbox_chan, 0);
> -
> - ret = 0;
> break;
> case RPM_CMD_INTENT:
> qcom_glink_handle_intent(glink, param1, param2, avail);
> --
> 2.14.1
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web