Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3926228pxj; Mon, 21 Jun 2021 09:31:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgg0FwVv/itzeRp59JXRAqJhE7LeRe82zZaYWk2XOhn23HXxiT2ZcFDS63tLL4cbDQ70aZ X-Received: by 2002:a17:906:6d95:: with SMTP id h21mr25742880ejt.260.1624293083163; Mon, 21 Jun 2021 09:31:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624293083; cv=none; d=google.com; s=arc-20160816; b=S8OqTMUFK2cN4P05FX5kdoo0Nh0dh5xdpNaCBQV7ZIBiRHpu+Hy7b6ShpL4/iBCZZW L4s3KJAQP57O5dFCmsAlI/ufrU51xLZkpGb9g72C1zAdTyDNRmH5aRaWWUmGzl+JG91R lUqfGY6nHuPGNE8IvHAki4KAmGuQ7u0nlOwGPizEpHIaZs/CgrH4cMF2G2mYEBqqfgA5 8rg/yRdPh8nD9QxWhEewDad9VQ2+wQqzFgZ9gFHOZTv/wjFAAfGA8fB4RltoAVjih03w AfmFb4kDeScrCdH3fj7tDkRnPugtAPjHgKgNGPHNlCaHIvigDfSkQuT4djr/IoxIaLM2 k18A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C15nEWinP818Qrt6nUAR5bXnLVlPCxxtJpk9d+QK4yI=; b=vRMfdBG8rydUtkoNhusSClJJWUmEggcaOj4tGDRgA8QHOd8R9v2h6D6ACtRCWlHr5n +jJfSCL3FRQOMlwWgs3vliZfcFr2J4n5vOOO+UEAUlzlOXhoHXn6jD+cWLsxHt+/FnA/ CocpzePFAtkU2qWqoXkxxfEY7OgDOHTIgy6Q43hWr5vep9IxHBv9y4NxmfirsGcbF3yr XbDAiQLsMXLjzAF8IyVBrZZ3gq0fmZEZSedgKIJhVo+Mpe7POAQd08ZVrl7wGKMDbtM9 YqZX6MGHAkE8LTdI72FZjN8As0ApnJzLzTS+fffkSsAiD2n361tnZh6728J/RpU3q/Gc WiRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ma1AMhKq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs19si11200240ejb.398.2021.06.21.09.31.00; Mon, 21 Jun 2021 09:31:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ma1AMhKq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231387AbhFUQbC (ORCPT + 99 others); Mon, 21 Jun 2021 12:31:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:48302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232304AbhFUQ3M (ORCPT ); Mon, 21 Jun 2021 12:29:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7762C613F3; Mon, 21 Jun 2021 16:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1624292637; bh=GPZlmCmG5Ozv64hMj2PJFVS6AWHaoBhOPRTJYmhJWpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ma1AMhKqRetwfblOOIKjl8ikbKkEXQTLQnl6Ga3LpNl5Kp8Prq9+imM11KnWjppeS d4z+hYsoISZOId00w2MFIIEh7iU2yXxK1iohmYYHf2OsAPGH3oDUSbwpr6YTKZzg3n gZ/VP3OU+al4luaQUHn+25zjBLR0vfr1K05AAxpI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Skripkin , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 073/146] net: ethernet: fix potential use-after-free in ec_bhf_remove Date: Mon, 21 Jun 2021 18:15:03 +0200 Message-Id: <20210621154915.515545612@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210621154911.244649123@linuxfoundation.org> References: <20210621154911.244649123@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Skripkin [ Upstream commit 9cca0c2d70149160407bda9a9446ce0c29b6e6c6 ] static void ec_bhf_remove(struct pci_dev *dev) { ... struct ec_bhf_priv *priv = netdev_priv(net_dev); unregister_netdev(net_dev); free_netdev(net_dev); pci_iounmap(dev, priv->dma_io); pci_iounmap(dev, priv->io); ... } priv is netdev private data, but it is used after free_netdev(). It can cause use-after-free when accessing priv pointer. So, fix it by moving free_netdev() after pci_iounmap() calls. Fixes: 6af55ff52b02 ("Driver for Beckhoff CX5020 EtherCAT master module.") Signed-off-by: Pavel Skripkin Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ec_bhf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c index 46b0dbab8aad..7c992172933b 100644 --- a/drivers/net/ethernet/ec_bhf.c +++ b/drivers/net/ethernet/ec_bhf.c @@ -576,10 +576,12 @@ static void ec_bhf_remove(struct pci_dev *dev) struct ec_bhf_priv *priv = netdev_priv(net_dev); unregister_netdev(net_dev); - free_netdev(net_dev); pci_iounmap(dev, priv->dma_io); pci_iounmap(dev, priv->io); + + free_netdev(net_dev); + pci_release_regions(dev); pci_clear_master(dev); pci_disable_device(dev); -- 2.30.2