Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B65E2C43381 for ; Sun, 17 Mar 2019 17:46:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53A4120857 for ; Sun, 17 Mar 2019 17:46:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ericsson.com header.i=@ericsson.com header.b="faqM2VV2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727017AbfCQRqp (ORCPT ); Sun, 17 Mar 2019 13:46:45 -0400 Received: from sessmg23.ericsson.net ([193.180.251.45]:48772 "EHLO sessmg23.ericsson.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726115AbfCQRqp (ORCPT ); Sun, 17 Mar 2019 13:46:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/relaxed; q=dns/txt; i=@ericsson.com; t=1552844802; x=1555436802; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=C9NTqFQca0xwzIsf19VDDXBlj59aUyipDMXB/t7uFwI=; b=faqM2VV2zIG6mc9mZPRsC6PVeXF4xiiY7LgV95ZqfgsvVqB+tG1O4/1RAm7q4CWO koUUl1HKHUe0mWPpKT99MRQ0Nc8lSjLM3G9fljanFj/xzpqOMFPPGb4eyUEJX/ld HmGHv8a366GHdWTG00kuIWbidSdrWIqwqxlMMa3ZAg4=; X-AuditID: c1b4fb2d-db5ff7000000062f-a8-5c8e8802df51 Received: from ESESBMB501.ericsson.se (Unknown_Domain [153.88.183.114]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id FE.BA.01583.2088E8C5; Sun, 17 Mar 2019 18:46:42 +0100 (CET) Received: from ESESSMR506.ericsson.se (153.88.183.128) by ESESBMB501.ericsson.se (153.88.183.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Sun, 17 Mar 2019 18:46:42 +0100 Received: from ESESSMB504.ericsson.se (153.88.183.165) by ESESSMR506.ericsson.se (153.88.183.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Sun, 17 Mar 2019 18:46:41 +0100 Received: from tipsy.lab.linux.ericsson.se (153.88.183.153) by smtp.internal.ericsson.com (153.88.183.192) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Sun, 17 Mar 2019 18:46:41 +0100 From: Jon Maloy To: , CC: , , , , , , Subject: [net v2 1/1] tipc: allow service ranges to be connect()'ed on RDM/DGRAM Date: Sun, 17 Mar 2019 18:46:42 +0100 Message-ID: <1552844802-3885-1-git-send-email-jon.maloy@ericsson.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRmVeSWpSXmKPExsUyM2J7kS5TR1+MwflzihY3GnqYLeacb2Gx WLF7EqvF21ez2C2OLRCz2HI+y+JK+1l2i8fXrzM7cHhsWXmTyePdFTaP3Qs+M3l83iTnsX7L VqYA1igum5TUnMyy1CJ9uwSujPun3rMWTOav6Nv1mq2BcSVPFyMnh4SAicTN+YuZuxi5OIQE jjBKNN6bwgrhfGOU+NN5hhnOmXLmMDuEc4FR4u+/qWwg/WwCGhIvp3UwgtgiAsYSr1Z2MoEU MQs8ZpT4cn8VWJGwQIDEjXuLWUFsFgFVian/u8BsXgFXiV+T3rBDHCIncf74T2YQW0hAWWLu h2lMEDWCEidnPmEBsZkFJCQOvnjBPIGRfxaS1CwkqQWMTKsYRYtTi4tz042M9VKLMpOLi/Pz 9PJSSzYxAgP44JbfujsYV792PMQowMGoxMO7Or0vRog1say4MvcQowQHs5IIrxZIiDclsbIq tSg/vqg0J7X4EKM0B4uSOO8fIcEYIYH0xJLU7NTUgtQimCwTB6dUA+Na04eVx3jbH5wvmh0/ f9GBzHc8otsLrVawXp0c/UR1dmbK6iXLRB5UrNvzLiQ87vQdv3MfNn187xIauNCaaWPnot8a t7aLV/zZ9Pqsbe1zPmevu24X1U7Uf+/tya7M/H1G0LKq+7Q1V+6qCOOfXnKL6vVtf06Tb1II P7Ijp0P3fxnLnJ+BU4WVWIozEg21mIuKEwFgkBJwXAIAAA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Erik Hugne We move the check that prevents connecting service ranges to after the RDM/DGRAM check, and move address sanity control to a separate function that also validates the service range. Fixes: 23998835be98 ("tipc: improve address sanity check in tipc_connect()") Signed-off-by: Erik Hugne Signed-off-by: Jon Maloy --- v2: address check function returns bool as suggested by davem --- net/tipc/socket.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index d6b2686..b542f14 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2349,6 +2349,16 @@ static int tipc_wait_for_connect(struct socket *sock, long *timeo_p) return 0; } +static bool tipc_sockaddr_is_sane(struct sockaddr_tipc *addr) +{ + if (addr->family != AF_TIPC) + return false; + if (addr->addrtype == TIPC_SERVICE_RANGE) + return (addr->addr.nameseq.lower <= addr->addr.nameseq.upper); + return (addr->addrtype == TIPC_SERVICE_ADDR || + addr->addrtype == TIPC_SOCKET_ADDR); +} + /** * tipc_connect - establish a connection to another TIPC port * @sock: socket structure @@ -2384,18 +2394,18 @@ static int tipc_connect(struct socket *sock, struct sockaddr *dest, if (!tipc_sk_type_connectionless(sk)) res = -EINVAL; goto exit; - } else if (dst->family != AF_TIPC) { - res = -EINVAL; } - if (dst->addrtype != TIPC_ADDR_ID && dst->addrtype != TIPC_ADDR_NAME) + if (!tipc_sockaddr_is_sane(dst)) { res = -EINVAL; - if (res) goto exit; - + } /* DGRAM/RDM connect(), just save the destaddr */ if (tipc_sk_type_connectionless(sk)) { memcpy(&tsk->peer, dest, destlen); goto exit; + } else if (dst->addrtype == TIPC_SERVICE_RANGE) { + res = -EINVAL; + goto exit; } previous = sk->sk_state; -- 2.1.4