Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1110756ybn; Tue, 24 Sep 2019 15:02:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyX+4pLO5FmTZkhs8iwxpaPrEqMbxkTNudX+kKxGwuqYUhwSEulRcGZYL4Zqree2N84S+jv X-Received: by 2002:a5d:66d2:: with SMTP id k18mr1913522wrw.7.1569362578302; Tue, 24 Sep 2019 15:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569362578; cv=none; d=google.com; s=arc-20160816; b=QDTOk/2QBAwPwuLgFtR7UewRFTmMvR3xp3BEgDfWgsDmyTOGFs407HLdoEZOgUCIbp /RPkdbYLNgQZ4fK2I6I4JGmw9sk2CjPyt37XKq6G225mRQo/vFp8NrxeKi+d8rHuUMAP ZJHZXmOADu3o/B2lutu+WUga11e7NWNfbEMieGwbLSHsjYLnW2w7my+8sonwQgPmEptb 0rWe6Hbkgr6I6ZFGNkQEEf1PRzqPsMWGipymN9Q1KDIN2IXefaaj0znpn1c85e7ZtfyM 3smmKkdN2HNynL02YUwK7E3gh4KL2XNxHC6Y/c8/FlOTN9KObKl3TvBDk1fdwt6m0u13 VeTw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T6y1jYSX0Gj4LUsxmqeOtyKxeoU9vJZVMuVgzeEf6z8=; b=EY20RV88c+iTpzK0he8R9lq67l49qzz4nZgWNs1P0qvs69xPOdNcCn9UpWhDjCJkYE 2LhCAXO638QyQWaeEM1V9Rg3yG1vgTfmL+fua65slPyIgGrzShioS5tYyrNC9Yd3XJZd XcWatQWkFrY/ghoI91RT7EMuiRERvyOnY2WU5iG0uuEL1jgno76mlItmSa0P8wfzXVHA gmg6sCmBW6zpHXydMtjswYmRJ2Pn2q42qUn/b2loPMBQvMt8GFwqFaYrIU96w2u5fiIx zZmCT4XNgCnA3fyCcDJzVIEeg7m2ncruerNpkDzAafxp9aRH1p9RRNlKY05IydzxrkXU HF7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GLMEcEAr; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t18si1604644eju.329.2019.09.24.15.02.34; Tue, 24 Sep 2019 15:02:58 -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=GLMEcEAr; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437997AbfIVTc2 (ORCPT + 99 others); Sun, 22 Sep 2019 15:32:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:44946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391472AbfIVSsO (ORCPT ); Sun, 22 Sep 2019 14:48:14 -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 90192208C2; Sun, 22 Sep 2019 18:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178093; bh=1qcIqWVNgDnORZDuw7aMihN8tv/7ZLu/i1Km/FS0zBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GLMEcEArlArvMj/Ewd4bWjQF17a1ML2h7l2sM+I4LbEH8KUSwWAkf7Nf9puq+vY4m WbBXYHvHWGEkYgtlqQ+pTp60FBhbhsShMThwxlA6R0AhBNTRx4Oi9DGTaTEDPrvr/h PGMhQLOhDFf84Y0AFmnpj4ZFGc9Q6pZJokaHa3dg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , "Rafael J . Wysocki" , Sasha Levin , linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 158/203] ACPI / PCI: fix acpi_pci_irq_enable() memory leak Date: Sun, 22 Sep 2019 14:43:04 -0400 Message-Id: <20190922184350.30563-158-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-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: Wenwen Wang [ Upstream commit 29b49958cf73b439b17fa29e9a25210809a6c01c ] In acpi_pci_irq_enable(), 'entry' is allocated by kzalloc() in acpi_pci_irq_check_entry() (invoked from acpi_pci_irq_lookup()). However, it is not deallocated if acpi_pci_irq_valid() returns false, leading to a memory leak. To fix this issue, free 'entry' before returning 0. Fixes: e237a5518425 ("x86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected"") Signed-off-by: Wenwen Wang Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/pci_irq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index d2549ae65e1b6..dea8a60e18a4c 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -449,8 +449,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev) * No IRQ known to the ACPI subsystem - maybe the BIOS / * driver reported one, then use it. Exit in any case. */ - if (!acpi_pci_irq_valid(dev, pin)) + if (!acpi_pci_irq_valid(dev, pin)) { + kfree(entry); return 0; + } if (acpi_isa_register_gsi(dev)) dev_warn(&dev->dev, "PCI INT %c: no GSI\n", -- 2.20.1