Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp474503yba; Wed, 15 May 2019 04:47:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/+6/1brtNQLLj69Yc79Fix027wTABnmCrxhf11ErykgZvEJo2wb8UlHjDf4M/HRpBZc0o X-Received: by 2002:a17:902:9007:: with SMTP id a7mr42529903plp.221.1557920840371; Wed, 15 May 2019 04:47:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557920840; cv=none; d=google.com; s=arc-20160816; b=NwbFPUDdxxCWJ5DtpjQMDM0vHNhJwJdq1moR2lgjgAEUZo/vAOFxm4lHEvdJtwQdZK ZnxIcP4vUNg5G5vrdniPqpOjQT/SLbgi+dYXRjhu9aEw3FJ9TLe4XUFQZwOsHjvDDO72 4uni/VMEbSNsXRCD3U5Bhk5NiLgV16z83UEqyrO6NU8PtH3llO/YrI7QvswWyKc9jqXQ 5dRvHZvNa0SKQ9HKNtWpHX1MBvhL0AkRUYmhZKvFudyludFU3xT+y1DEdONyJgoT0bFQ C1HZeUO6SEe6lm//opu64DarTP1XGDlEYn+utPZBMcfsnhbphd/Zk9W+TldscZFGq/Ug T9xg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tHxbcECDLTWLG98p+8A5kfw4Wai7VxK9kRIGdxPo+Zs=; b=XEYggv3fZnEAW0MCvcYczRv9CTKXC8KclyUnoS6QMvU8bIvatM8DjNFXD57xFzPRZE 2+s3F2D8HDryWsLqsZ3cjv0Ur94rUrSsPeqMmvTC3Ccj5CNbOMGLKYMKahaXdn0BXyTh mjxtdS9nAleUX78Fqkba+g2tPFOn6tAsAJOXgDKcJkU6YWqUR6/Fh0+Bu6KtfnA5b4Cm taUYNvcmKvFCVj4y3c4regaYMMO1yGqEYIppGuCzrPlDizLMCmx3orU2w8chGqWdGTmj Utash2pCq1FL1H1TOXhYaeXcE4032XVFrpEPFYR2MjkKnNWEG5O8s+KPk2GnSgWIQIyW dTXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FJUBL8aU; 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 u19si1642057pgm.471.2019.05.15.04.47.05; Wed, 15 May 2019 04:47:20 -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=FJUBL8aU; 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 S1732029AbfEOLZk (ORCPT + 99 others); Wed, 15 May 2019 07:25:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:36370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732011AbfEOLZd (ORCPT ); Wed, 15 May 2019 07:25:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 BA7F22089E; Wed, 15 May 2019 11:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919533; bh=GtcRU5ZM3n54XN/gJfZc+nyZGktY5oRZUcZIHhUpe/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FJUBL8aU6FBu3/bO24cmrIp0rar44RMEk0eKzE0cBP85S9BjjjAznlUZsSg1v4I41 p+OC+iDv0XMpXkBJT6iKajS49NYmTZmrFnvw160uROa68yMgM0LeME2vM1jBzTSEqr vCzw6xfeIam3E/VWoQKcO2MQYgR+3aClU3rK5vTw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dexuan Cui , Lorenzo Pieralisi , Stephen Hemminger , Michael Kelley Subject: [PATCH 4.19 111/113] PCI: hv: Fix a memory leak in hv_eject_device_work() Date: Wed, 15 May 2019 12:56:42 +0200 Message-Id: <20190515090702.123647432@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090652.640988966@linuxfoundation.org> References: <20190515090652.640988966@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dexuan Cui commit 05f151a73ec2b23ffbff706e5203e729a995cdc2 upstream. When a device is created in new_pcichild_device(), hpdev->refs is set to 2 (i.e. the initial value of 1 plus the get_pcichild()). When we hot remove the device from the host, in a Linux VM we first call hv_pci_eject_device(), which increases hpdev->refs by get_pcichild() and then schedules a work of hv_eject_device_work(), so hpdev->refs becomes 3 (let's ignore the paired get/put_pcichild() in other places). But in hv_eject_device_work(), currently we only call put_pcichild() twice, meaning the 'hpdev' struct can't be freed in put_pcichild(). Add one put_pcichild() to fix the memory leak. The device can also be removed when we run "rmmod pci-hyperv". On this path (hv_pci_remove() -> hv_pci_bus_exit() -> hv_pci_devices_present()), hpdev->refs is 2, and we do correctly call put_pcichild() twice in pci_devices_present_work(). Fixes: 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs") Signed-off-by: Dexuan Cui [lorenzo.pieralisi@arm.com: commit log rework] Signed-off-by: Lorenzo Pieralisi Reviewed-by: Stephen Hemminger Reviewed-by: Michael Kelley Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/pci/controller/pci-hyperv.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -1905,6 +1905,9 @@ static void hv_eject_device_work(struct sizeof(*ejct_pkt), (unsigned long)&ctxt.pkt, VM_PKT_DATA_INBAND, 0); + /* For the get_pcichild() in hv_pci_eject_device() */ + put_pcichild(hpdev); + /* For the two refs got in new_pcichild_device() */ put_pcichild(hpdev); put_pcichild(hpdev); put_hvpcibus(hpdev->hbus);