From patchwork Fri Mar 17 23:07:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 740566 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 3vlP3L2X77z9ryj for ; Sat, 18 Mar 2017 11:58:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="U51WQzJZ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751251AbdCRA6Q (ORCPT ); Fri, 17 Mar 2017 20:58:16 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:32856 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072AbdCRA6P (ORCPT ); Fri, 17 Mar 2017 20:58:15 -0400 Received: by mail-pf0-f172.google.com with SMTP id e129so5317015pfh.0 for ; Fri, 17 Mar 2017 17:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=oMRd9tMEJ92HGLJNlYJCg1ZNvJ2Wo5NWRcvieYralFc=; b=U51WQzJZDCUhomHkzMXCYpUdwPbRdMGBpe2uD91klISXvM3BQL8KtedrI1ePa0QfYy q9QmJpLcxye1+uHdatFTK09FFIhkM3zipi4mpjzBMCfSlk7cLs37wMYdpDspIqa1fvat EdipuyzSgKfnY0MZ6pmlie2q1c5ewM76QSbig= 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; bh=oMRd9tMEJ92HGLJNlYJCg1ZNvJ2Wo5NWRcvieYralFc=; b=OveYv05M+WN3Bpciq30oj5+MjzDKdJJPbL88ARgdbcv3B4P+kyUy/vD/BHlaerJZze QyqYh5pmHQoHS5kpQhYTb0z2Ba8AL0DggGJHwV6YfKIfcGzyk/ISB9khrihfEWtEg8Xn ZH8bTAfuZKz8oraK3iSTmU0jGC8cOPmMvx/hT54DYBUWGYf6/+ucqsCclHjP8oQ/oVpS Qssh6uIeFr+RhAjq/r03dmylk7TMG+8WNd1SMGWmTHpNqfPP8AwhQCWRLdZCburWDhOm 1MRAy5AneLHNFc39w30YiFlEbpuy0WSUBjqgPSuQ7D6xfTY+K706WNS0pMAvnfdKqYvf 0gTg== X-Gm-Message-State: AFeK/H2U8ZTRQj3VnVYEZRaVUjyB0XgIhLuO2K3LZsf4HoZye6/MMySYyhIwQiORx5dyhGDX X-Received: by 10.84.230.131 with SMTP id e3mr14266208plk.100.1489792037176; Fri, 17 Mar 2017 16:07:17 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id s12sm18780700pfj.9.2017.03.17.16.07.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Mar 2017 16:07:16 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: David Ahern Subject: [PATCH] net: vrf: Reset rt6i_idev in local dst after put Date: Fri, 17 Mar 2017 16:07:11 -0700 Message-Id: <1489792031-13547-1-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The VRF driver takes a reference to the inet6_dev on the VRF device for its rt6_local dst when handling local traffic through the VRF device as a loopback. When the device is deleted the driver does a put on the idev but does not reset rt6i_idev in the rt6_info struct. When the dst is destroyed, dst_destroy calls ip6_dst_destroy which does a second put for what is essentially the same reference causing it to be prematurely freed. Reset rt6i_idev after the put in the vrf driver. Fixes: b4869aa2f881e ("net: vrf: ipv6 support for local traffic to local addresses") Signed-off-by: David Ahern --- drivers/net/vrf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 7f28021d9d93..761ea041b018 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -462,8 +462,10 @@ static void vrf_rt6_release(struct net_device *dev, struct net_vrf *vrf) } if (rt6_local) { - if (rt6_local->rt6i_idev) + if (rt6_local->rt6i_idev) { in6_dev_put(rt6_local->rt6i_idev); + rt6_local->rt6i_idev = NULL; + } dst = &rt6_local->dst; dev_put(dst->dev);