]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/smc: sync err code when tcp connection was refused
authorliuyacan <liuyacan@corp.netease.com>
Thu, 21 Apr 2022 09:40:27 +0000 (17:40 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Apr 2022 10:10:49 +0000 (11:10 +0100)
In the current implementation, when TCP initiates a connection
to an unavailable [ip,port], ECONNREFUSED will be stored in the
TCP socket, but SMC will not. However, some apps (like curl) use
getsockopt(,,SO_ERROR,,) to get the error information, which makes
them miss the error message and behave strangely.

Fixes: 1aaff5a888fc ("net/smc: nonblocking connect rework")
Signed-off-by: liuyacan <liuyacan@corp.netease.com>
Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>
Acked-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/smc/af_smc.c

index fc7b6eb22143e5f45a7f89f4463825819be2b67b..bbb1a4ce50505c35541f2eafce976c8258a52d41 100644 (file)
@@ -1475,6 +1475,8 @@ static void smc_connect_work(struct work_struct *work)
                smc->sk.sk_state = SMC_CLOSED;
                if (rc == -EPIPE || rc == -EAGAIN)
                        smc->sk.sk_err = EPIPE;
+               else if (rc == -ECONNREFUSED)
+                       smc->sk.sk_err = ECONNREFUSED;
                else if (signal_pending(current))
                        smc->sk.sk_err = -sock_intr_errno(timeo);
                sock_put(&smc->sk); /* passive closing */