From patchwork Thu Jun 22 19:03:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 779681 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 3wtrc40bYRz9s82 for ; Fri, 23 Jun 2017 05:04:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RsAQtjKk"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753755AbdFVTE2 (ORCPT ); Thu, 22 Jun 2017 15:04:28 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33676 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753367AbdFVTE1 (ORCPT ); Thu, 22 Jun 2017 15:04:27 -0400 Received: by mail-pf0-f195.google.com with SMTP id w12so4268988pfk.0 for ; Thu, 22 Jun 2017 12:04:26 -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=EGypp6P+QG8Hb0BDRv6ySB19yUpuk8/7jjHBOvpVdFU=; b=RsAQtjKkXHuJloXvN/vWdc+ruuh3Qv2yJ4TFTD92WkmjaTgLNgwopzd2viAKlWfvBM HyYDJLPiZEsuONE9Gbmu00Qbkqxg0Ol+PfzOgyFbnla6s3EbK1KPItIMhPzi5VVLYrBJ UWTdiWjO7QlDFNn1wa/sX9JrQwGx+rP2m5DtlZly7TAKa9ek9sLLyhicDSkIw9KuBtOl nCgdLb9MKSHBLc7bUmusM6eWlwoxqZoeqs02VEO9JMA+TSBy7CNL5HIWLhaf/24/mCQv RC6QiPofyl8x28sj8zOjPe+NNBjOfSQAcdb5jszNmrlyZk3cY0VEZ79R8Pu5GCpgaxGb G+jg== 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=EGypp6P+QG8Hb0BDRv6ySB19yUpuk8/7jjHBOvpVdFU=; b=HXFMZUwnjiAe3gVw+Pi8Fbc/qzjCWTdwysFoAaoOyAXUVubBOUTkAc9Yanb3XvLMec VE0eNUhJWAS5PD9KJzZm9GXmCm8PTcS5tpNREW4E1lTRhKs969cfbEGMorH/OyttntHq OcBPO9aYWRXpLna51zNExt+wtlvur5SIZFIpCNOIvRqY0wqvwvVz36mZuXqLV1UqxhWe Bdcw2UfFW97ODU9iB04cGM3XApV45oRbc5Z+EI0DjSMxB78xijRxHag7PYUmvoQNi+Sy AmV1/3dwzurETzHMoNmaSw0xOw3U3O8RMySoXRz6uuB247czvVEAiKOzN+TeDSDa/dIL qB/g== X-Gm-Message-State: AKS2vOz6FRgUVoYtCUDj+Sd/9DI7RNWS+SmBcBlfxtDPgPnvqaZjcjcm JSi8VUUUcZPDg5PxC4A= X-Received: by 10.84.139.195 with SMTP id 61mr4463309plr.90.1498158256356; Thu, 22 Jun 2017 12:04:16 -0700 (PDT) Received: from weiwan0.mtv.corp.google.com ([100.123.230.66]) by smtp.gmail.com with ESMTPSA id u1sm4942225pgq.53.2017.06.22.12.04.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jun 2017 12:04:15 -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 v2 net] udpv6: reset daddr and dport in sk if connect() fails Date: Thu, 22 Jun 2017 12:03:41 -0700 Message-Id: <20170622190341.87998-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 so that udp_v6_early_demux() won't consider this socket as a valid candidate for early demux. v2: fix compilation error Signed-off-by: Wei Wang Acked-by: Maciej Żenczykowski --- net/ipv6/datagram.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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);