From patchwork Wed Aug 28 07:29:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Hugne X-Patchwork-Id: 270378 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 173C12C0085 for ; Wed, 28 Aug 2013 17:30:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754465Ab3H1Haj (ORCPT ); Wed, 28 Aug 2013 03:30:39 -0400 Received: from mailgw2.ericsson.se ([193.180.251.37]:61059 "EHLO mailgw2.ericsson.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751897Ab3H1Hai (ORCPT ); Wed, 28 Aug 2013 03:30:38 -0400 X-AuditID: c1b4fb25-b7eff8e000000eda-ea-521da71cd0bd Received: from ESESSHC011.ericsson.se (Unknown_Domain [153.88.253.124]) by mailgw2.ericsson.se (Symantec Mail Security) with SMTP id 7F.34.03802.C17AD125; Wed, 28 Aug 2013 09:30:37 +0200 (CEST) Received: from eerihug-hybrid.rnd.ki.sw.ericsson.se (147.214.213.166) by ESESSHC011.ericsson.se (153.88.183.51) with Microsoft SMTP Server (TLS) id 14.2.328.9; Wed, 28 Aug 2013 09:30:30 +0200 From: To: , , , CC: , , Erik Hugne Subject: [PATCH v2] tipc: set sk_err correctly when connection fails Date: Wed, 28 Aug 2013 09:29:58 +0200 Message-ID: <1377674998-18872-1-git-send-email-erik.hugne@ericsson.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Originating-IP: [147.214.213.166] X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrIJMWRmVeSWpSXmKPExsUyM+Jvja7sctkgg/UbeCyOLRCz+HDlNrPF tb3HmS22nM+yeHz9OrMDq8e7K2weuxd8ZvL4vEnOY/2WrUwBLFFcNimpOZllqUX6dglcGac/ HGMv+MFT8fwNewPjEq4uRk4OCQETiY5NPYwQtpjEhXvr2boYuTiEBA4zSqxefJcJznm3cBYz SBWbgLzE+UW3gRIcHCICRRIbWyVATGaBAok1HRogFcICLhJnDl1mAbFZBFQl7i/bxQ5Swivg LrF3IzeIKSGgIDFnkg1IBa+AoMTJmU/AqpkFJCQOvngBtkdIQEXi/svZ7BCXKUt8vvySaQIj /ywkLbOQtCxgZFrFyJ6bmJmTXm60iREYbAe3/FbdwXjnnMghRmkOFiVx3s16ZwKFBNITS1Kz U1MLUovii0pzUosPMTJxcEo1MAZmVhb3Zq9VnPjB8h57Fp9Sh+IdyyLR7YEzi7rUmGTEP8/S duXVTvMyOxh2VenT09BAzn1lu6t28Ku1Ox46PkW5rizwkmCilKdLphYP52TLwwUPX7ZWvTh2 /QLL1CW2RX8LvcuFS2V6qnSkuo6HLekzMos52n21/0dq0olTAZueTF7FXdmgxFKckWioxVxU nAgATforPAQCAAA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Erik Hugne Should a connect fail, if the publication/server is unavailable or due to some other error, a positive value will be returned and errno is never set. If the application code checks for an explicit zero return from connect (success) or a negative return (failure), it will not catch the error and subsequent send() calls will fail as shown from the strace snippet below. socket(0x1e /* PF_??? */, SOCK_SEQPACKET, 0) = 3 connect(3, {sa_family=0x1e /* AF_??? */, sa_data="\2\1\322\4\0\0\322\4\0\0\0\0\0\0"}, 16) = 111 sendto(3, "test", 4, 0, NULL, 0) = -1 EPIPE (Broken pipe) The reason for this behaviour is that TIPC wrongly inverts error codes set in sk_err. Signed-off-by: Erik Hugne --- [v2: add more details to commit message] net/tipc/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index ce8249c..6cc7ddd 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1257,7 +1257,7 @@ static u32 filter_connect(struct tipc_sock *tsock, struct sk_buff **buf) /* Accept only ACK or NACK message */ if (unlikely(msg_errcode(msg))) { sock->state = SS_DISCONNECTING; - sk->sk_err = -ECONNREFUSED; + sk->sk_err = ECONNREFUSED; retval = TIPC_OK; break; } @@ -1268,7 +1268,7 @@ static u32 filter_connect(struct tipc_sock *tsock, struct sk_buff **buf) res = auto_connect(sock, msg); if (res) { sock->state = SS_DISCONNECTING; - sk->sk_err = res; + sk->sk_err = -res; retval = TIPC_OK; break; }