]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
slimbus: fix retries comparison to correctly identify failed allocation
authorColin Ian King <colin.king@canonical.com>
Tue, 2 Jan 2018 17:54:20 +0000 (17:54 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Jan 2018 16:00:13 +0000 (17:00 +0100)
Currently the check for too many retries fails because retries is actually
-1 when the retry loop terminates if no pbuf can be allocated because of
the post decrement on retries.  Fix this by not comparing retries with zero
but instead check if it is negative.

Detected by CoverityScan, CID#1463143 ("Logically dead code") and
CID#1463144 ("Dereference after null check")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/slimbus/qcom-ctrl.c

index fb1a5e0eb8dd2b9c3c011af429ddabd99df695ea..2d67419a3c37c4d1007cd47ca572401616c50318 100644 (file)
@@ -345,7 +345,7 @@ static int qcom_xfer_msg(struct slim_controller *sctrl,
                }
        }
 
-       if (!retries && !pbuf)
+       if (retries < 0 && !pbuf)
                return -ENOMEM;
 
        puc = (u8 *)pbuf;