diff options
| author | Guangguan Wang <guangguan.wang@linux.alibaba.com> | 2024-12-11 10:21:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-12-15 13:34:59 +0100 |
| commit | c5b8ee5022a19464783058dc6042e8eefa34e8cd (patch) | |
| tree | 2c4f5f1ee9a7a39964ef13e5373a62518fbe0c4c /net/smc | |
| parent | net/smc: check smcd_v2_ext_offset when receiving proposal msg (diff) | |
| download | linux-c5b8ee5022a19464783058dc6042e8eefa34e8cd.tar.xz linux-c5b8ee5022a19464783058dc6042e8eefa34e8cd.zip | |
net/smc: check return value of sock_recvmsg when draining clc data
When receiving clc msg, the field length in smc_clc_msg_hdr indicates the
length of msg should be received from network and the value should not be
fully trusted as it is from the network. Once the value of length exceeds
the value of buflen in function smc_clc_wait_msg it may run into deadloop
when trying to drain the remaining data exceeding buflen.
This patch checks the return value of sock_recvmsg when draining data in
case of deadloop in draining.
Fixes: fb4f79264c0f ("net/smc: tolerate future SMCD versions")
Signed-off-by: Guangguan Wang <guangguan.wang@linux.alibaba.com>
Reviewed-by: Wen Gu <guwen@linux.alibaba.com>
Reviewed-by: D. Wythe <alibuda@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_clc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index f721d03efcbd..521f5df80e10 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -774,6 +774,11 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, SMC_CLC_RECV_BUF_LEN : datlen; iov_iter_kvec(&msg.msg_iter, ITER_DEST, &vec, 1, recvlen); len = sock_recvmsg(smc->clcsock, &msg, krflags); + if (len < recvlen) { + smc->sk.sk_err = EPROTO; + reason_code = -EPROTO; + goto out; + } datlen -= len; } if (clcm->type == SMC_CLC_DECLINE) { |