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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT 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 F047DC4360F for ; Fri, 29 Mar 2019 16:22:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9FF6218A3 for ; Fri, 29 Mar 2019 16:22:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729700AbfC2QW0 (ORCPT ); Fri, 29 Mar 2019 12:22:26 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:35300 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728924AbfC2QW0 (ORCPT ); Fri, 29 Mar 2019 12:22:26 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E60B380D; Fri, 29 Mar 2019 09:22:25 -0700 (PDT) Received: from e107981-ln.cambridge.arm.com (e107981-ln.cambridge.arm.com [10.1.197.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AE9A33F68F; Fri, 29 Mar 2019 09:22:24 -0700 (PDT) Date: Fri, 29 Mar 2019 16:22:17 +0000 From: Lorenzo Pieralisi To: Kangjie Lu Cc: Simon Horman , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] pci: pcie-rcar: fix a potential NULL pointer dereference Message-ID: <20190329162217.GA7138@e107981-ln.cambridge.arm.com> References: <20190315072943.22923-1-kjlu@umn.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190315072943.22923-1-kjlu@umn.edu> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 15, 2019 at 02:29:43AM -0500, Kangjie Lu wrote: > In case __get_free_pages fails and returns NULL, the fix returns > -ENOMEM and releases resources to avoid NULL pointer dereference. > > Signed-off-by: Kangjie Lu > Reviewed-by: Geert Uytterhoeven > > --- > V2 removes the error message. > --- > drivers/pci/controller/pcie-rcar.c | 4 ++++ > 1 file changed, 4 insertions(+) Applied to pci/rcar for v5.2, thanks. Lorenzo > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index c8febb009454..71e55995c058 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -929,6 +929,10 @@ static int rcar_pcie_enable_msi(struct rcar_pcie *pcie) > > /* setup MSI data target */ > msi->pages = __get_free_pages(GFP_KERNEL, 0); > + if (!msi->pages) { > + err = -ENOMEM; > + goto err; > + } > base = virt_to_phys((void *)msi->pages); > > rcar_pci_write_reg(pcie, base | MSIFE, PCIEMSIALR); > -- > 2.17.1 >