Received: by 10.213.65.68 with SMTP id h4csp1765557imn; Mon, 19 Mar 2018 12:38:46 -0700 (PDT) X-Google-Smtp-Source: AG47ELtPnhANAP703dt4Z6+lVn1t7qHXNSLOJomW8xFyzp4dAZ8mMIjYWEiWZ3VDyNSHyr6dbdEU X-Received: by 10.99.126.24 with SMTP id z24mr10054236pgc.110.1521488325882; Mon, 19 Mar 2018 12:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521488325; cv=none; d=google.com; s=arc-20160816; b=PNBy8gs4DYFkDcL0dS2yIZpHMBUjTkPlu0qI80gJNiaWCKJWfg3FGTKGkakASzmq0Y 1ONXcYWjFz+Zou4ReiUq1ICxCMBy3vZ0QcPrSi3OtPTj0u1iKK/WKG9Pwj0qOQDzdSt6 5pVWczm5PTQj7MVaVCoMiPRHp5jqdNay6b2Vp1teBueM89hpoM6HoeK5clkSm0pIeE2i 2pV/1rXEvcHyBaVJ4LgGbIEHCHkGLtpwUPZ70KO+NtRjoVQYzE0IvNYfZyU8L8GsWSzM eyRsrcFnYlSSP5/8IMLCD8Brdxr7n5wL13OCImJBoTvY6Zyl1f4yVq5EL8CCM885CZ6f p5Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=1zo7KIejlorsEtEYd70+2WqXFQiZqX1Ct23SS6OJydA=; b=sED+JIOYX9udBKiBvp7btMnJI1E0u3LHverX2d8ayqy8xrj6g9IUQMJ238WWHhb8Pl S9YqoDqUeltfdiDyYggfm9RSWhBz9oUIcqRAYzQzrlrAzFuBHL4sPfnkRq1F3XF/uW8/ OmjVi5GFi9RqcABanrLforT8HU4we40CN4Q5zeyPFmvSCeSbpCUes2YucBRW5uBJ1BZk J0PJRZ57s/OwP3M4sOPGVfZhXF5U2JALPcpHKa5Oikn7XQjog3RlgFHb9zzZijCpJNdh lbtjFKS7syXiCzfoUpI/NoQgCcRDLowJtSBf3bb2m9k4w7rKVYYBUCred7AA49yIG3wE Ez6w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 94-v6si521785pla.215.2018.03.19.12.38.31; Mon, 19 Mar 2018 12:38:45 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936136AbeCSTfw (ORCPT + 99 others); Mon, 19 Mar 2018 15:35:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48596 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031299AbeCSSWf (ORCPT ); Mon, 19 Mar 2018 14:22:35 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 32D21129D; Mon, 19 Mar 2018 18:22:35 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Duyck , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 4.9 070/241] i40e/i40evf: Fix use after free in Rx cleanup path Date: Mon, 19 Mar 2018 19:05:35 +0100 Message-Id: <20180319180754.100136355@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Duyck [ Upstream commit 741b8b832a57402380be79d7d11a59eaf57fff3b ] We need to reset skb back to NULL when we have freed it in the Rx cleanup path. I found one spot where this wasn't occurring so this patch fixes it. Change-ID: Iaca68934200732cd4a63eb0bd83b539c95f8c4dd Signed-off-by: Alexander Duyck Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1 + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1 + 2 files changed, 2 insertions(+) --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c @@ -1820,6 +1820,7 @@ static int i40e_clean_rx_irq(struct i40e */ if (unlikely(i40e_test_staterr(rx_desc, BIT(I40E_RXD_QW1_ERROR_SHIFT)))) { dev_kfree_skb_any(skb); + skb = NULL; continue; } --- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c @@ -1262,6 +1262,7 @@ static int i40e_clean_rx_irq(struct i40e */ if (unlikely(i40e_test_staterr(rx_desc, BIT(I40E_RXD_QW1_ERROR_SHIFT)))) { dev_kfree_skb_any(skb); + skb = NULL; continue; }