From patchwork Mon Apr 17 23:24:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subash Abhinov Kasiviswanathan X-Patchwork-Id: 751596 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 3w6PXp4DZlz9s2s for ; Tue, 18 Apr 2017 09:26:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="UcTlj765"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="nLsstWLO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755055AbdDQX0c (ORCPT ); Mon, 17 Apr 2017 19:26:32 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:39764 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900AbdDQX0a (ORCPT ); Mon, 17 Apr 2017 19:26:30 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3017460F71; Mon, 17 Apr 2017 23:26:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492471590; bh=ob0q16UarFoZPSYIiRjdSvQVDmv4p9x0e0yl77OUnXA=; h=From:To:Cc:Subject:Date:From; b=UcTlj765WpNnn8fVkYfhGOuNtnuoxC1a+pu9Rr9v3kn7iAuWaIYXkwU2ryfTJ3GvN CREd4Y1LXyS6Ri6JtU9UTwWYupyM7EEFUjleTuHb6/P/IZuaDLJgP98+2UpLArI796 5MKrWpU3F75+o0dQPihzapC4sSPVgYaE28VX6xYw= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from subashab-lnx.qualcomm.com (unknown [129.46.15.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: subashab@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 9154660F60; Mon, 17 Apr 2017 23:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1492471589; bh=ob0q16UarFoZPSYIiRjdSvQVDmv4p9x0e0yl77OUnXA=; h=From:To:Cc:Subject:Date:From; b=nLsstWLOELyK/B8gdq2QSZl3i9Gx0e3qZj4DBCVIFBrU9czbjdzAqq8wBiJUAGMth qaOA/9PJFMrlfA+fCyvEnzDqTZzNCMkIk7XN8YGRtI37ArWiVRZnoeO6olAv+xic/E 7V3rXDlEglBJwqR70qQC9ay+4gsp8rFOQfA2Yw2Q= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9154660F60 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=subashab@codeaurora.org From: Subash Abhinov Kasiviswanathan To: dsa@cumulusnetworks.com, davem@davemloft.net, netdev@vger.kernel.org, rshearma@brocade.com, eric.dumazet@gmail.com Cc: Subash Abhinov Kasiviswanathan , Eric Dumazet Subject: [PATCH net-next v2] net: ipv6: Fix UDP early demux lookup with udp_l3mdev_accept=0 Date: Mon, 17 Apr 2017 17:24:55 -0600 Message-Id: <1492471495-13073-1-git-send-email-subashab@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org David Ahern reported that 5425077d73e0c ("net: ipv6: Add early demux handler for UDP unicast") breaks udp_l3mdev_accept=0 since early demux for IPv6 UDP was doing a generic socket lookup which does not require an exact match. Fix this by making UDPv6 early demux match connected sockets only. v1->v2: Take reference to socket after match as suggested by Eric Fixes: 5425077d73e0c ("net: ipv6: Add early demux handler for UDP unicast") Reported-by: David Ahern Signed-off-by: Subash Abhinov Kasiviswanathan Cc: Eric Dumazet Acked-by: David Ahern Tested-by: David Ahern --- net/ipv6/udp.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index b793ed1..5a4504b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -864,21 +865,25 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, return 0; } + static struct sock *__udp6_lib_demux_lookup(struct net *net, __be16 loc_port, const struct in6_addr *loc_addr, __be16 rmt_port, const struct in6_addr *rmt_addr, int dif) { + unsigned short hnum = ntohs(loc_port); + unsigned int hash2 = udp6_portaddr_hash(net, loc_addr, hnum); + unsigned int slot2 = hash2 & udp_table.mask; + struct udp_hslot *hslot2 = &udp_table.hash2[slot2]; + const __portpair ports = INET_COMBINED_PORTS(rmt_port, hnum); struct sock *sk; - rcu_read_lock(); - sk = __udp6_lib_lookup(net, rmt_addr, rmt_port, loc_addr, loc_port, - dif, &udp_table, NULL); - if (sk && !atomic_inc_not_zero(&sk->sk_refcnt)) - sk = NULL; - rcu_read_unlock(); - - return sk; + udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) { + if (INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif)) + return sk; + break; + } + return NULL; } static void udp_v6_early_demux(struct sk_buff *skb) @@ -903,7 +908,7 @@ static void udp_v6_early_demux(struct sk_buff *skb) else return; - if (!sk) + if (!sk || !atomic_inc_not_zero_hint(&sk->sk_refcnt, 2)) return; skb->sk = sk;