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=-7.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 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 B433DC3A59E for ; Mon, 2 Sep 2019 21:20:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8644021881 for ; Mon, 2 Sep 2019 21:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567459211; bh=adpfd823EB3CZAjJliOGyXZBB1zVrQLHHUxWf5yPSdY=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=siPDtZ/TtXn6I7KrnzjtyF5banIVJx7uKmO9kEV2zIqXDvr5N6o6VLKLBxYQfBXix qqdnfze4JUcVWuhrjBDY2ZnrBnfIBj7DcRQMAehKnMausbyYvPpNn1BYQVyslB0Lmg T4ak9JstAoOgWInbsGlw+J50s/yDUYkmd2aveC+E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727644AbfIBVUL (ORCPT ); Mon, 2 Sep 2019 17:20:11 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:34608 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727318AbfIBVUK (ORCPT ); Mon, 2 Sep 2019 17:20:10 -0400 Received: by mail-oi1-f196.google.com with SMTP id g128so11281214oib.1; Mon, 02 Sep 2019 14:20:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+lpVdJyYQZ7LkgNkMVrzaDCTE1l3PZ7/Lcu/MbmwZUI=; b=n1gbMIZvQhdc8KkN89ingFIug7M/vLOSmZLTZtW8bj/LNfCwIrXmTOYWIxux+HwjpO jYAAF5JXwMo4heOWckHITtHHgvCm0joaxBMraHd44X4pMzMn8Hd7SlFfpvm6mYzSbrhD W0BWdBXoGGNJhzZ9oxsihO3Pc8bKxo7S8WdSaJWRFIJ9HHrmWDx16KC76Aqzc1oWzeXs kKl63VXDcdq+nZL1uA6LVqK2SMYC3euzX6ZVOcE50TcbGgZdT5XaleCvoR0uLvfsDNkI 9i0QUQ4t3ZkxS/ijjhCgUBEBPMx4KVOcYwRj/ljvQYsTjPF6Ud0U23lrw+HTYQTzaIpc ZyBA== X-Gm-Message-State: APjAAAWeWPHThHj0TFdMIky4boNfLrLdFC2GVoaSjEJNzL+ynn7DLQj6 YJKkSdeChZWmGvrVaDu+Ks1CZ9LyZ5zFzuyBRDQ= X-Google-Smtp-Source: APXvYqwGCGf60riIo4v+fCFvupHhE0kAak7ebOC0RWF/EbO4OMDuyX8HFStQAA9Yx0Dxupl7HJV8ug6sWt7FA5L1hys= X-Received: by 2002:aca:b808:: with SMTP id i8mr19471537oif.68.1567459209611; Mon, 02 Sep 2019 14:20:09 -0700 (PDT) MIME-Version: 1.0 References: <1566359059-4844-1-git-send-email-wenwen@cs.uga.edu> In-Reply-To: <1566359059-4844-1-git-send-email-wenwen@cs.uga.edu> From: "Rafael J. Wysocki" Date: Mon, 2 Sep 2019 23:19:58 +0200 Message-ID: Subject: Re: [PATCH v2] ACPI / PCI: fix acpi_pci_irq_enable() memory leak To: Wenwen Wang , Bjorn Helgaas Cc: "Rafael J. Wysocki" , Len Brown , "open list:PCI SUBSYSTEM" , "open list:ACPI" , open list Content-Type: text/plain; charset="UTF-8" Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Wed, Aug 21, 2019 at 5:44 AM Wenwen Wang wrote: > > 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 Bjorn, any more comments? > --- > 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 d2549ae..dea8a60 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.7.4 >