summaryrefslogtreecommitdiffstats
path: root/net/smc
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-09-18 15:46:38 +0200
committerDavid S. Miller <davem@davemloft.net>2018-09-18 20:11:43 -0700
commit381897798a94065ffcad0772eecdc6b04a7ff23d (patch)
treebfc86186fb6cc7065f1a5bebd2a34d8751da5d94 /net/smc
parent71d117f527425e2d6a5029e8365d82a8d2d6916a (diff)
downloadlinux-381897798a94065ffcad0772eecdc6b04a7ff23d.tar.bz2
net/smc: fix sizeof to int comparison
Comparing an int to a size, which is unsigned, causes the int to become unsigned, giving the wrong result. kernel_sendmsg can return a negative error code. Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: Ursula Braun <ubraun@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
-rw-r--r--net/smc/smc_clc.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
index 83aba9ade060..52241d679cc9 100644
--- a/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@ -446,14 +446,12 @@ int smc_clc_send_proposal(struct smc_sock *smc, int smc_type,
vec[i++].iov_len = sizeof(trl);
/* due to the few bytes needed for clc-handshake this cannot block */
len = kernel_sendmsg(smc->clcsock, &msg, vec, i, plen);
- if (len < sizeof(pclc)) {
- if (len >= 0) {
- reason_code = -ENETUNREACH;
- smc->sk.sk_err = -reason_code;
- } else {
- smc->sk.sk_err = smc->clcsock->sk->sk_err;
- reason_code = -smc->sk.sk_err;
- }
+ if (len < 0) {
+ smc->sk.sk_err = smc->clcsock->sk->sk_err;
+ reason_code = -smc->sk.sk_err;
+ } else if (len < (int)sizeof(pclc)) {
+ reason_code = -ENETUNREACH;
+ smc->sk.sk_err = -reason_code;
}
return reason_code;