From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06371CA9EA9 for ; Fri, 18 Oct 2019 22:16:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4C2820854 for ; Fri, 18 Oct 2019 22:16:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436982; bh=eB8OcREBndT+A5hyfQrTyGkWl3QxuRF+jZflQikaaIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GOU/kb45X4V/0jT9UFYBurYOVHb4zcJJq+pFeQRPtRAMxMUoTP7newj2ur7GzWesl 3Z8fF7RKWcr1HGB/SOZ3Hz+jY1dfJI1sMKasuNoU/jzbCsVPIonB+JYfjSKCv2Ot3t L/y1+11o5HUaY7hfcikspATrF3aH3tAWAMj9oYew= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387786AbfJRWI1 (ORCPT ); Fri, 18 Oct 2019 18:08:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:40856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387759AbfJRWI0 (ORCPT ); Fri, 18 Oct 2019 18:08:26 -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 AD3442245C; Fri, 18 Oct 2019 22:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436505; bh=eB8OcREBndT+A5hyfQrTyGkWl3QxuRF+jZflQikaaIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0tqOiDE0sKqrvGZcosVqo3EHIat64BeZ7tRzUvQTeO3DJHixqyEdPovHsuzz0dXYK v6x0xpkNBC334pQC/fdduaA94ZpDVk7hsl81X0PJOJA/iivZmbjVXkfq+V/K357l2Q MqsQZER4Cq85vIlyuUMPnPqtbAAn1HdpW3eHoUbQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sven Van Asbroeck , Sven Van Asbroeck , Bjorn Helgaas , Sinan Kaya , Frederick Lawler , Mika Westerberg , Keith Busch , "Rafael J . Wysocki" , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 17/56] PCI/PME: Fix possible use-after-free on remove Date: Fri, 18 Oct 2019 18:07:14 -0400 Message-Id: <20191018220753.10002-17-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220753.10002-1-sashal@kernel.org> References: <20191018220753.10002-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Sven Van Asbroeck [ Upstream commit 7cf58b79b3072029af127ae865ffc6f00f34b1f8 ] In remove(), ensure that the PME work cannot run after kfree() is called. Otherwise, this could result in a use-after-free. This issue was detected with the help of Coccinelle. Signed-off-by: Sven Van Asbroeck Signed-off-by: Bjorn Helgaas Cc: Sinan Kaya Cc: Frederick Lawler Cc: Mika Westerberg Cc: Keith Busch Cc: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/pci/pcie/pme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c index c2e6e3d1073f8..5500660bbb104 100644 --- a/drivers/pci/pcie/pme.c +++ b/drivers/pci/pcie/pme.c @@ -441,6 +441,7 @@ static void pcie_pme_remove(struct pcie_device *srv) pcie_pme_disable_interrupt(srv->port, data); free_irq(srv->irq, srv); + cancel_work_sync(&data->work); kfree(data); } -- 2.20.1