diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-09-18 15:46:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-19 05:11:43 +0200 |
| commit | 381897798a94065ffcad0772eecdc6b04a7ff23d (patch) | |
| tree | bfc86186fb6cc7065f1a5bebd2a34d8751da5d94 | |
| parent | net/smc: no urgent data check for listen sockets (diff) | |
| download | linux-381897798a94065ffcad0772eecdc6b04a7ff23d.tar.xz linux-381897798a94065ffcad0772eecdc6b04a7ff23d.zip | |
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>
| -rw-r--r-- | net/smc/smc_clc.c | 14 |
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; |