From: Hans Wippel <hwippel@linux.vnet.ibm.com>

Date: Thu, 21 Sep 2017 09:16:27 +0200

Subject: net/smc: add receive timeout check

Patch-mainline: v4.14-rc2

Git-commit: 846e344eb7229018457d6d6fc1ab0cc0a167692f

References: bsc#1096003, FATE#325023, LTC#164003

The SMC receive function currently lacks a timeout check under the

condition that no data were received and no data are available. This

patch adds such a check.

Signed-off-by: Hans Wippel <hwippel@linux.vnet.ibm.com>

Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Johannes Thumshirn <jthumshirn@suse.de>

---

 net/smc/smc_rx.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c

index b17a333e9bb0..3e631ae4b6b6 100644

--- a/net/smc/smc_rx.c

+++ b/net/smc/smc_rx.c

@@ -148,6 +148,8 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, size_t len,

 				read_done = sock_intr_errno(timeo);

 				break;

 			}

+			if (!timeo)

+				return -EAGAIN;

 		}

 		if (!atomic_read(&conn->bytes_to_rcv)) {