From patchwork Fri Jun 23 22:25:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 780304 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 3wvY1m27Dcz9ryb for ; Sat, 24 Jun 2017 08:25:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VDgI9KiV"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754138AbdFWWZq (ORCPT ); Fri, 23 Jun 2017 18:25:46 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33007 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752606AbdFWWZp (ORCPT ); Fri, 23 Jun 2017 18:25:45 -0400 Received: by mail-pf0-f196.google.com with SMTP id w12so9220547pfk.0 for ; Fri, 23 Jun 2017 15:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k4tHNKoVWCSjBuKukl4O0ORN/M+V4pzTIZxtWAgCdLk=; b=VDgI9KiVpmmahRifTHZU+lJGcWIISA2h+j0LTjc2bOYaFr70bbRCSrSFT0e8AiNUmm cX0AOroy4JrqbG1a1JG9S1xRfN5hZadfvGJvrZMwe/9YJnB9PQZPaABunAONQ32rzYh4 j6zlGRaLSO4s/mr9iqHP9JAkGf0xvKxtAaUm81Fij11EqPiScGLBtsretTp0Cn5Vs96D ccHgMEHp/3N0sDsZbuumOnnJIoIpbpF/R70jJv7cDm+3ujPTnfikEt3Y/GpKgZH0ZCOR uePkEFQK27YDPnoxC9liM7oLAFkUkQ3HsV4gD3OfGbcyz+zq4SzXT7+MdtC1VcPeG0RD FLqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k4tHNKoVWCSjBuKukl4O0ORN/M+V4pzTIZxtWAgCdLk=; b=Xul/UHKWz7Ttw4PVXowM5tZtkkHv5qeoQCEuJ8pbUzkTMCQlx6usot6IbgkyB9SSl0 ZC01396kjo0iAIhqHKOoJjcSV8Yv3vIyzh/rv2rYlwr7ZtfZlpcqKAdtAcwPDy/3xeXs +dCUtaZm3YHYLatV9sTZZYC8vX7Uh+NuQRE3Pg7dy2sU8iddPHLOyfvobKNYxUOCHwYe T8l+K2EB8p0Wyx/+7LV79RyEs8BlXBCFVBNaUKA0MiATsX0YzeOvGsfmrz3wfOey7S7D /apnkgQQqThxxNo/mn3LiIWFWyqg2iNlVoiXOBRpoHByRZYBc/HFp1kr5SaDnbDIuZIU cCnA== X-Gm-Message-State: AKS2vOzQcfyosNRzaonMCQPZkExf8h9boSjT+F/eL5R8poYrfLZ1Y3pN O042jsc2ofMnRQ== X-Received: by 10.99.178.20 with SMTP id x20mr10122760pge.220.1498256744631; Fri, 23 Jun 2017 15:25:44 -0700 (PDT) Received: from weiwan0.mtv.corp.google.com ([100.123.230.66]) by smtp.gmail.com with ESMTPSA id l72sm11403719pfg.97.2017.06.23.15.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Jun 2017 15:25:43 -0700 (PDT) From: Wei Wang To: David Miller , netdev@vger.kernel.org Cc: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Subash Abhinov Kasiviswanathan , Wei Wang Subject: [PATCH v3 net] net: ipv6: reset daddr and dport in sk if connect() fails Date: Fri, 23 Jun 2017 15:25:37 -0700 Message-Id: <20170623222537.130493-1-tracywwnj@gmail.com> X-Mailer: git-send-email 2.13.1.611.g7e3b11ae1-goog MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang In __ip6_datagram_connect(), reset sk->sk_v6_daddr and inet->dport if error occurs. In udp_v6_early_demux(), check for sk_state to make sure it is in TCP_ESTABLISHED state. Together, it makes sure unconnected UDP socket won't be considered as a valid candidate for early demux. Fixes: 5425077d73e0 ("net: ipv6: Add early demux handler for UDP unicast") v3: add TCP_ESTABLISHED state check in udp_v6_early_demux() v2: fix compilation error Signed-off-by: Wei Wang Acked-by: Maciej Żenczykowski --- net/ipv6/datagram.c | 8 +++++++- net/ipv6/udp.c | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index e011122ebd43..5c786f5ab961 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c @@ -250,8 +250,14 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, */ err = ip6_datagram_dst_update(sk, true); - if (err) + if (err) { + /* Reset daddr and dport so that udp_v6_early_demux() + * fails to find this socket + */ + memset(&sk->sk_v6_daddr, 0, sizeof(sk->sk_v6_daddr)); + inet->inet_dport = 0; goto out; + } sk->sk_state = TCP_ESTABLISHED; sk_set_txhash(sk); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 2b33847bf931..d494b2621b11 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -880,7 +880,8 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net, struct sock *sk; udp_portaddr_for_each_entry_rcu(sk, &hslot2->head) { - if (INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif)) + if (sk->sk_state == TCP_ESTABLISHED && + INET6_MATCH(sk, net, rmt_addr, loc_addr, ports, dif)) return sk; /* Only check first socket in chain */ break;