From patchwork Thu Jun 15 02:29:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haishuang Yan X-Patchwork-Id: 776055 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 3wp6ss6xYDz9sCZ for ; Thu, 15 Jun 2017 12:30:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752403AbdFOC35 (ORCPT ); Wed, 14 Jun 2017 22:29:57 -0400 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:54596 "EHLO cmccmta3.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888AbdFOC3z (ORCPT ); Wed, 14 Jun 2017 22:29:55 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.15]) by rmmx-syy-dmz-app11-12011 (RichMail) with SMTP id 2eeb5941f120009-2a163; Thu, 15 Jun 2017 10:29:53 +0800 (CST) X-RM-TRANSID: 2eeb5941f120009-2a163 X-RM-SPAM-FLAG: 00000000 Received: from localhost (unknown[223.105.0.240]) by rmsmtp-syy-appsvr08-12008 (RichMail) with SMTP id 2ee85941f117d78-3949c; Thu, 15 Jun 2017 10:29:44 +0800 (CST) X-RM-TRANSID: 2ee85941f117d78-3949c From: Haishuang Yan To: "David S. Miller" , Eric Dumazet , Pravin B Shelar , Alexei Starovoitov Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haishuang Yan Subject: [PATCH v4 2/2] ip6_tunnel: fix potential issue in __ip6_tnl_rcv Date: Thu, 15 Jun 2017 10:29:30 +0800 Message-Id: <1497493770-13000-2-git-send-email-yanhaishuang@cmss.chinamobile.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497493770-13000-1-git-send-email-yanhaishuang@cmss.chinamobile.com> References: <1497493770-13000-1-git-send-email-yanhaishuang@cmss.chinamobile.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When __ip6_tnl_rcv fails, the tun_dst won't be freed, so call dst_release to free it in error code path. Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels") CC: Alexei Starovoitov Tested-by: Zhang Shengju Signed-off-by: Haishuang Yan --- Changes since v4: * Add the the missing Fixes information * Free tun_dst from error code path * Add tester information --- net/ipv6/ip6_tunnel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 9b37f97..ef99d59 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -859,6 +859,8 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb, return 0; drop: + if (tun_dst) + dst_release((struct dst_entry *)tun_dst); kfree_skb(skb); return 0; }