Received: by 2002:a17:90a:2044:0:0:0:0 with SMTP id n62csp1277113pjc; Wed, 22 May 2019 13:06:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+uPU/0bo/rv60EK89MQUhXzGp5Th8Ax8hFlozk9WN7cY6K788UsampUS+0fdtHTGWDCrx X-Received: by 2002:a62:f245:: with SMTP id y5mr29808812pfl.12.1558555577143; Wed, 22 May 2019 13:06:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558555577; cv=none; d=google.com; s=arc-20160816; b=WnC47D4noFcG8v/vqZNTrjhaUGBLVidwrvKIB8I7odzHpKh/N3Nzk+uoEPHV6IEflh BQZYB5r83j5kibVuFKqL56iwmOcE7Ot2CZGXCUy+AChcSFN9vxZr/+gfzYuEHB26jDkH Vdq8S1mWxYn/PghyebIbGW00WyDIYD3OpKkm+6JzmJ8Twv9t/zknKkq0FLyJsxU1oQvm PZDLXZpsuWwcRtpOi48mxSS+Z1VZv3Fa50frLIL20x69wkVTyImRU2hP+5P2Q16uvNre cFPA3J3dfHg21Z5Iq4XuR90k1vF93pzo2k/2IO1nvMlCVZVwXja8ojw0nhS6ZJGT4WXL EzLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D5DC97+JRC4Ff7S49VdM1/FklUNQSeUvFeJQ4M+EkdI=; b=Vg/exRSDIIr6BLpw9ah1uSx1RCuUSoO6mCpKsbMZ2ZmduV6OxIn8MH+ACh2Pp/XlG5 wPimilGkSvnNMh174fCehWzTQwp4FXzT9mPg4fUgi3fIkWms9p3ddc0mM8Tzuo6QYWJR /sidzWL2YQIlu6TJe3n6cfHANHyxaRNdUu9LfyNBR8WMQ6P1frErRaQlZtUnQd0OSg7q 83twqU+G/26Qod24vl8dGvbPZggmkMm1mR2aOM9jZDbFvxn445V1Kz6/Vrpud4k2Toe6 aP/yXiABZl+nBl1VR2riqpcjnBK9M/FbulFFT5ytk/xX+dmzSnPF3B5i4e0MwQAzZFXb crzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xdAgm7dZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x29si26825600pgl.194.2019.05.22.13.06.01; Wed, 22 May 2019 13:06:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xdAgm7dZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732130AbfEVUEP (ORCPT + 99 others); Wed, 22 May 2019 16:04:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:42008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729937AbfEVTVb (ORCPT ); Wed, 22 May 2019 15:21:31 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC801217D4; Wed, 22 May 2019 19:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558552890; bh=LCKP4eDolnwtBjnan8oPnWRJSNMCYpIpwhcShYyVK8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xdAgm7dZHCdVyVxTxbB5Ce2ayCiimN532eiCfruEp/jBjVqe7XFLsGVhSBr0FNUvK IyyH+Qm+8M2YleregqFaI1iu3IczHbcbgmEdacdH0czO25cYV2ewxBTGvNJ9cFJJrE 4e4Gq1yb/57OXLZ7zfMX/SWJVMYvfd5ciYi7KjOw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Stefan Bader , Peter Oskolkov , Florian Westphal , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 011/375] ip6: fix skb leak in ip6frag_expire_frag_queue() Date: Wed, 22 May 2019 15:15:11 -0400 Message-Id: <20190522192115.22666-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192115.22666-1-sashal@kernel.org> References: <20190522192115.22666-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 47d3d7fdb10a21c223036b58bd70ffdc24a472c4 ] Since ip6frag_expire_frag_queue() now pulls the head skb from frag queue, we should no longer use skb_get(), since this leads to an skb leak. Stefan Bader initially reported a problem in 4.4.stable [1] caused by the skb_get(), so this patch should also fix this issue. 296583.091021] kernel BUG at /build/linux-6VmqmP/linux-4.4.0/net/core/skbuff.c:1207! [296583.091734] Call Trace: [296583.091749] [] __pskb_pull_tail+0x50/0x350 [296583.091764] [] _decode_session6+0x26a/0x400 [296583.091779] [] __xfrm_decode_session+0x39/0x50 [296583.091795] [] icmpv6_route_lookup+0xf0/0x1c0 [296583.091809] [] icmp6_send+0x5e1/0x940 [296583.091823] [] ? __netif_receive_skb+0x18/0x60 [296583.091838] [] ? netif_receive_skb_internal+0x32/0xa0 [296583.091858] [] ? ixgbe_clean_rx_irq+0x594/0xac0 [ixgbe] [296583.091876] [] ? nf_ct_net_exit+0x50/0x50 [nf_defrag_ipv6] [296583.091893] [] icmpv6_send+0x21/0x30 [296583.091906] [] ip6_expire_frag_queue+0xe0/0x120 [296583.091921] [] nf_ct_frag6_expire+0x1f/0x30 [nf_defrag_ipv6] [296583.091938] [] call_timer_fn+0x37/0x140 [296583.091951] [] ? nf_ct_net_exit+0x50/0x50 [nf_defrag_ipv6] [296583.091968] [] run_timer_softirq+0x234/0x330 [296583.091982] [] __do_softirq+0x109/0x2b0 Fixes: d4289fcc9b16 ("net: IP6 defrag: use rbtrees for IPv6 defrag") Signed-off-by: Eric Dumazet Reported-by: Stefan Bader Cc: Peter Oskolkov Cc: Florian Westphal Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/ipv6_frag.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/net/ipv6_frag.h b/include/net/ipv6_frag.h index 28aa9b30aecea..1f77fb4dc79df 100644 --- a/include/net/ipv6_frag.h +++ b/include/net/ipv6_frag.h @@ -94,7 +94,6 @@ ip6frag_expire_frag_queue(struct net *net, struct frag_queue *fq) goto out; head->dev = dev; - skb_get(head); spin_unlock(&fq->q.lock); icmpv6_send(head, ICMPV6_TIME_EXCEED, ICMPV6_EXC_FRAGTIME, 0); -- 2.20.1