From patchwork Tue Sep 29 11:00:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 291148 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 3B703C4727F for ; Tue, 29 Sep 2020 11:35:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9F7723AA3 for ; Tue, 29 Sep 2020 11:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601379332; bh=eRMfmZFwTImPEWtl1fuuHttjQfss4QTdStH+7CxWtYs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ACZHbicGky7vCZQ6FgHM6D9H1d1PvVU70vEM0l5e5t4FXMuKkJpyHLQB7kCxqgF5r pnvDnhZAzEiN9Dxnkf6QZEUkv2H3pAD9ZqE2qrgJI9fGX4C9t1DAXLdXl8aM9ECBZG /BL196cQUn2oFWauPA1p5Tja6zHZaEGk1KP578+w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729841AbgI2Lf3 (ORCPT ); Tue, 29 Sep 2020 07:35:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:49122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729783AbgI2LfK (ORCPT ); Tue, 29 Sep 2020 07:35:10 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AFF7123CD1; Tue, 29 Sep 2020 11:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601378940; bh=eRMfmZFwTImPEWtl1fuuHttjQfss4QTdStH+7CxWtYs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uhFIxDz2jEIkQ29GbOTysO1kFCW/ZL5B0FWIZCpEbTGfI07JIjSAS7whSsel/wSXH 1lFUrJl+nijYFvlCLHOy4C1o+5++UTpTkEw7wSFSjpSiCzlsGQ5zqnBLUK+oLV5xgs NXhQEjxawKFx6guOhM6A4sU8rJX21HJMrOzZMVOY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qian Cai , Daniel Wagner , Cornelia Huck , Alex Williamson , Sasha Levin Subject: [PATCH 4.19 194/245] vfio/pci: Clear error and request eventfd ctx after releasing Date: Tue, 29 Sep 2020 13:00:45 +0200 Message-Id: <20200929105956.421220350@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105946.978650816@linuxfoundation.org> References: <20200929105946.978650816@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Williamson [ Upstream commit 5c5866c593bbd444d0339ede6a8fb5f14ff66d72 ] The next use of the device will generate an underflow from the stale reference. Cc: Qian Cai Fixes: 1518ac272e78 ("vfio/pci: fix memory leaks of eventfd ctx") Reported-by: Daniel Wagner Reviewed-by: Cornelia Huck Tested-by: Daniel Wagner Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/pci/vfio_pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 86cd8bdfa9f28..94fad366312f1 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -409,10 +409,14 @@ static void vfio_pci_release(void *device_data) if (!(--vdev->refcnt)) { vfio_spapr_pci_eeh_release(vdev->pdev); vfio_pci_disable(vdev); - if (vdev->err_trigger) + if (vdev->err_trigger) { eventfd_ctx_put(vdev->err_trigger); - if (vdev->req_trigger) + vdev->err_trigger = NULL; + } + if (vdev->req_trigger) { eventfd_ctx_put(vdev->req_trigger); + vdev->req_trigger = NULL; + } } mutex_unlock(&driver_lock);