summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter2017-02-18 22:34:59 +0100
committerAnna Schumaker2017-02-21 16:53:36 +0100
commit9761a2469dc287c6d75ca148f4fc483becbcad88 (patch)
treec59140035afb7f89906f920b488952a3d6a1913e
parentnlm: Ensure callback code also checks that the files match (diff)
downloadkernel-qcow2-linux-9761a2469dc287c6d75ca148f4fc483becbcad88.tar.gz
kernel-qcow2-linux-9761a2469dc287c6d75ca148f4fc483becbcad88.tar.xz
kernel-qcow2-linux-9761a2469dc287c6d75ca148f4fc483becbcad88.zip
sunrpc: silence uninitialized variable warning
kstrtouint() can return a couple different error codes so the check for "ret == -EINVAL" is wrong and static analysis tools correctly complain that we can use "num" without initializing it. It's not super harmful because we check the bounds. But it's also easy enough to fix. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
-rw-r--r--net/sunrpc/xprtsock.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 18b4e7ff8879..5cbabf2c75b2 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -3261,7 +3261,9 @@ static int param_set_uint_minmax(const char *val,
if (!val)
return -EINVAL;
ret = kstrtouint(val, 0, &num);
- if (ret == -EINVAL || num < min || num > max)
+ if (ret)
+ return ret;
+ if (num < min || num > max)
return -EINVAL;
*((unsigned int *)kp->arg) = num;
return 0;