From patchwork Mon Mar 25 21:31:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1064829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="gmPJJTJ9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44SnWZ4G9nz9sSR for ; Tue, 26 Mar 2019 08:31:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730015AbfCYVbU (ORCPT ); Mon, 25 Mar 2019 17:31:20 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:37750 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729297AbfCYVbU (ORCPT ); Mon, 25 Mar 2019 17:31:20 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 3F8E1A43 for ; Mon, 25 Mar 2019 21:31:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cSyLgj2JVYmW for ; Mon, 25 Mar 2019 16:31:19 -0500 (CDT) Received: from mail-it1-f198.google.com (mail-it1-f198.google.com [209.85.166.198]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 0B1DD9FD for ; Mon, 25 Mar 2019 16:31:19 -0500 (CDT) Received: by mail-it1-f198.google.com with SMTP id h82so10067390ita.7 for ; Mon, 25 Mar 2019 14:31:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OVxWXw8Sn3gNzOTimeFumsSWj/9YML5pciPmDNZvpy8=; b=gmPJJTJ9rJ4c46xHP9tSZTNViTHacnNY3bPCq9KagN73bEhsZCfQ3qEgjMvff24fxb qg6UV7Maxg7NCs3mTsDd1iwPmqTCWKSXJ1QaEULXLJvV8BFydMBUlTY9YXx1U0s5PyVO T2R2lMobT96Onp0xbJLnNMxa7l2ZcqnnhgUDbmhOwHNozLNDpL81HKQby0H68GdILPfr v93wNIFHLFesR/D3Xrsh7tqQ3efG5s1SkYYCO4ERWkMav4DMJIW1ZTmyMTo+CTU0Uxhv gUdE0+D862XOCu1n1jw5KTEP9llMSFq+51rpx4jjrsHxxwRu4czVUCxxIMiWCkQIebhN OVDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OVxWXw8Sn3gNzOTimeFumsSWj/9YML5pciPmDNZvpy8=; b=m5UeSr5kuGxHZH+J0p5h7jMVUvgZ3ocqIrUbB4FQTSlIjFcUTQMHuLA/mrvxhwN5LB ZrOD0dVeMNlTG7VfiTXpDdEj+6G1Yvg3suVe9FO/cq6TaeuK1xR2SZnuQZa7tFH4NXAD vWaUsnc1XmTTkDu8FHmteSsICvCXcD6OYtFCmSgg7iHfO2W/FpuhRWyqlUClh2JRK3WH MnafFWOPt411rpkgcRjBPIKNgFgCSHee3i3NgcYonTtdpVcPNNfjs5WLBwLLuLMLYMaZ 2dRJBCre17t6IB6WT8YlqRt/yRWIPkS/Hv1YSAtb8AJ5QDAOWba4rXjMyX0jEYUZR9mU 9daA== X-Gm-Message-State: APjAAAWj5IOVWBc0HxwCKehscisrXKeH77Y4cJUJNYFob2M30wLsC0Jo H3YnleouAIxtMXrNEZ3akDF61bzyDr6hhClaUos4Gn/6EdbJ0uQwMzZjvTGrGg5tH77LRqjOkBL TahUULzTEKZ/R2X2dtt5V9u5Z X-Received: by 2002:a02:1ac3:: with SMTP id 186mr19524377jai.96.1553549478656; Mon, 25 Mar 2019 14:31:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcGfD0Zm6chsvdgnkzcyYJasdQOZJzFaZhtJg3gYZfA/WaljxLp1iXvG6s9XLAVIHKRgmDOg== X-Received: by 2002:a02:1ac3:: with SMTP id 186mr19524353jai.96.1553549478422; Mon, 25 Mar 2019 14:31:18 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id v133sm660223ita.2.2019.03.25.14.31.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 14:31:17 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Lorenzo Pieralisi , Bjorn Helgaas , Michal Simek , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] pci: pcie-xilinx: fix a missing-check bug for __get_free_pages Date: Mon, 25 Mar 2019 16:31:13 -0500 Message-Id: <20190325213113.24705-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In case __get_free_pages fail, the fix returns -ENOMEMto avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Reviewed-by: Steven Price --- v2: caller is redefined to accept the error code, as suggested by Steven Price --- drivers/pci/controller/pcie-xilinx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c index 9bd1a35cd5d8..abc214e94f7c 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -336,14 +336,19 @@ static const struct irq_domain_ops msi_domain_ops = { * xilinx_pcie_enable_msi - Enable MSI support * @port: PCIe port information */ -static void xilinx_pcie_enable_msi(struct xilinx_pcie_port *port) +static int xilinx_pcie_enable_msi(struct xilinx_pcie_port *port) { phys_addr_t msg_addr; port->msi_pages = __get_free_pages(GFP_KERNEL, 0); + if (unlikely(!port->msi_pages)) + return -ENOMEM; + msg_addr = virt_to_phys((void *)port->msi_pages); pcie_write(port, 0x0, XILINX_PCIE_REG_MSIBASE1); pcie_write(port, msg_addr, XILINX_PCIE_REG_MSIBASE2); + + return 0; } /* INTx Functions */ @@ -498,6 +503,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port) struct device *dev = port->dev; struct device_node *node = dev->of_node; struct device_node *pcie_intc_node; + int ret; /* Setup INTx */ pcie_intc_node = of_get_next_child(node, NULL); @@ -526,7 +532,9 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port) return -ENODEV; } - xilinx_pcie_enable_msi(port); + ret = xilinx_pcie_enable_msi(port); + if (ret) + return ret; } return 0;