Skip to content

Commit

Permalink
net/smc: check return value of sock_recvmsg when draining clc data
Browse files Browse the repository at this point in the history
[ Upstream commit c5b8ee5 ]

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: fb4f792 ("net/smc: tolerate future SMCD versions")
Signed-off-by: Guangguan Wang <[email protected]>
Reviewed-by: Wen Gu <[email protected]>
Reviewed-by: D. Wythe <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
Guangguan Wang authored and gregkh committed Dec 27, 2024
1 parent e1cc8be commit d7d1f98
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions net/smc/smc_clc.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,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) {
Expand Down

0 comments on commit d7d1f98

Please sign in to comment.