From patchwork Fri Aug 31 11:38:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 964407 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 421y7B2cd1z9rvt for ; Fri, 31 Aug 2018 21:39:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727768AbeHaPqE (ORCPT ); Fri, 31 Aug 2018 11:46:04 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:57223 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726990AbeHaPqE (ORCPT ); Fri, 31 Aug 2018 11:46:04 -0400 Received: from [179.98.170.192] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fvhlR-0008TK-AA; Fri, 31 Aug 2018 11:38:57 +0000 From: Thadeu Lima de Souza Cascardo To: netdev@vger.kernel.org Cc: yoshfuji@linux-ipv6.org, kuznet@ms2.inr.ac.ru, davem@davemloft.net, herbert@gondor.apana.org.au, steffen.klassert@secunet.com, eyal.birger@gmail.com, sd@queasysnail.net, cascardo@canonical.com Subject: [PATCH v2] xfrm6: call kfree_skb when skb is toobig Date: Fri, 31 Aug 2018 08:38:49 -0300 Message-Id: <20180831113849.19909-1-cascardo@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180830125817.4567-1-cascardo@canonical.com> References: <20180830125817.4567-1-cascardo@canonical.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After commit d6990976af7c5d8f55903bfb4289b6fb030bf754 ("vti6: fix PMTU caching and reporting on xmit"), some too big skbs might be potentially passed down to __xfrm6_output, causing it to fail to transmit but not free the skb, causing a leak of skb, and consequentially a leak of dst references. After running pmtu.sh, that shows as failure to unregister devices in a namespace: [ 311.397671] unregister_netdevice: waiting for veth_b to become free. Usage count = 1 The fix is to call kfree_skb in case of transmit failures. Signed-off-by: Thadeu Lima de Souza Cascardo Reviewed-by: Sabrina Dubroca Fixes: dd767856a36e ("xfrm6: Don't call icmpv6_send on local error") --- net/ipv6/xfrm6_output.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index 5959ce9620eb..6a74080005cf 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c @@ -170,9 +170,11 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb) if (toobig && xfrm6_local_dontfrag(skb)) { xfrm6_local_rxpmtu(skb, mtu); + kfree_skb(skb); return -EMSGSIZE; } else if (!skb->ignore_df && toobig && skb->sk) { xfrm_local_error(skb, mtu); + kfree_skb(skb); return -EMSGSIZE; }