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,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 D95D3C43331 for ; Sun, 10 Nov 2019 02:52:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A463122583 for ; Sun, 10 Nov 2019 02:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354367; bh=avT296kkH6vYPf/CZXBH0ZritG7eBuOV/le7rkHC914=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xs/7LtfZdIy2NHKkRICvPsBs20BWRQfgnuFAVZ01nhRtNDi9D6rQ83fC6pcaD/oYu EJFrpMdfg4RtGn4ZADYaAylAiD2esVIjk6NuKTL4ec/KR+fdJ3Qa34qyCfktyZT+GT 2kaa9tb3AhMiGwFl/sjg5jUh28wJmbUW96tih4aQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728546AbfKJCwp (ORCPT ); Sat, 9 Nov 2019 21:52:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:36262 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730012AbfKJCvc (ORCPT ); Sat, 9 Nov 2019 21:51:32 -0500 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 368D022583; Sun, 10 Nov 2019 02:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354292; bh=avT296kkH6vYPf/CZXBH0ZritG7eBuOV/le7rkHC914=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I+enOqX5bDt6VqLO1KTIzMf5hy+GkKlqVz8XuHrkL/nEaqSQvcVfSaI+drcnuZjmG x9Gi3FeEUcvRlD/kp0lhCcwuMsSZdS3V4kDVbA4Y1sCLGzwlZgmdo+3pdDC1prgfSr pydu241RZXf6Bvoy21r+y47o9f2/PMesbq6KF2Gg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li Qiang , Eric Auger , Alex Williamson , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 32/40] vfio/pci: Fix potential memory leak in vfio_msi_cap_len Date: Sat, 9 Nov 2019 21:50:24 -0500 Message-Id: <20191110025032.827-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110025032.827-1-sashal@kernel.org> References: <20191110025032.827-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li Qiang [ Upstream commit 30ea32ab1951c80c6113f300fce2c70cd12659e4 ] Free allocated vdev->msi_perm in error path. Signed-off-by: Li Qiang Reviewed-by: Eric Auger Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/pci/vfio_pci_config.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index c55c632a3b249..ad5929fbceb16 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -1130,8 +1130,10 @@ static int vfio_msi_cap_len(struct vfio_pci_device *vdev, u8 pos) return -ENOMEM; ret = init_pci_cap_msi_perm(vdev->msi_perm, len, flags); - if (ret) + if (ret) { + kfree(vdev->msi_perm); return ret; + } return len; } -- 2.20.1