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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT 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 16E30C43381 for ; Mon, 25 Mar 2019 22:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7A4220811 for ; Mon, 25 Mar 2019 22:19:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="Ri/IWHh+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730362AbfCYWTR (ORCPT ); Mon, 25 Mar 2019 18:19:17 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:54278 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728912AbfCYWTR (ORCPT ); Mon, 25 Mar 2019 18:19:17 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id BD1D9957 for ; Mon, 25 Mar 2019 22:19:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d30YLgNi5o0u for ; Mon, 25 Mar 2019 17:19:15 -0500 (CDT) Received: from mail-it1-f197.google.com (mail-it1-f197.google.com [209.85.166.197]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 85B3392B for ; Mon, 25 Mar 2019 17:19:15 -0500 (CDT) Received: by mail-it1-f197.google.com with SMTP id r136so9820347ith.3 for ; Mon, 25 Mar 2019 15:19:15 -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=wMN6xXX31A6AdzQAJGc2vG9ofT3CoZG7Cbz+jNnp6f8=; b=Ri/IWHh+UZOTC7ZjY4+AHxTHHeE03LtftP/f73T6u1Ndc5c/G84oyC5h/XcypurBr/ m3txydiTyFZKrl9mX6le7RxJygALM1cd+VCRmv553UxKXOPiLu8qlHsLW6VQ/2GnfwF2 KrkNM+srVDJNlpryuymtMSzPYP3kgwtrXzmHqu+RxPVPspOm7GeAEu+Skr9X5YXgKZLU DJta+7ZXNvdYf8U5t4Oiqvrw8GBrbsWn5ZWkM8THTE7wJvHxzX/TSidF6fYMEWa+5fR6 3zU+Kjn1+zbCNW3i7102e1rCdCkh0VJ4XapJQ7aqKBYlZPptSpcitFAsgaXnscRksF0Q Sezg== 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=wMN6xXX31A6AdzQAJGc2vG9ofT3CoZG7Cbz+jNnp6f8=; b=RjNjnvCj/WcGkhROen18BU58UWwzTWFL5IvfcM9MPx+GhtoNrudCU4vp0IvSAHJ/BW Skt5xZYtPmI0clYbFCIzn+s/Crbjk2OoZPKDd5HxxG5eoFxXFJbx55yAExI0wkEGuIeI eYLZoKtraVj6L9Qw9kCPS2pblQJ1MjFOWws8CDHO3CiWTYCGrWhiX4M5EA+xiVuZlsPr hURTsIwUYRKpiVtpmalLdSU+WHLFcWWQWVM6rckVgt59Zi2etImb9CZ3xGSZ5pravpRj Z8U+L1T6RAu+HYR8i7vv/zVgHCWdPRsA0irqWbSmZQWeYFkwQwMx50h0ebb22KhutMfe SNbA== X-Gm-Message-State: APjAAAUZf/LP/wXIb3PhUNMYextM5m9kUpE6S7ohhVjpsUGQRRF74+mY pAkZU3UmvS33iFMzGfg7r++f9goVxSADuxFYNhH1WlDVGi1OE4xh6SfMJjyohlmtlS5DAa379Il 9OAwI6tUX69dDoY2pqYix4F2F8h82 X-Received: by 2002:a6b:e50d:: with SMTP id y13mr16967273ioc.142.1553552355183; Mon, 25 Mar 2019 15:19:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyJpikc1k86UuAZEIpBOenvhqms6j6+SUAXP6kJ8lTR9Ao9sezT7dyXG/DCDzkMGqenPZaMnw== X-Received: by 2002:a6b:e50d:: with SMTP id y13mr16967256ioc.142.1553552354910; Mon, 25 Mar 2019 15:19:14 -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 k4sm10043741itc.32.2019.03.25.15.19.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 15:19:14 -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 v3] PCI: xilinx: Check for __get_free_pages() failure Date: Mon, 25 Mar 2019 17:19:09 -0500 Message-Id: <20190325221909.26315-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190325215105.GB24180@google.com> References: <20190325215105.GB24180@google.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If __get_free_pages() fails, the patch returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- v3: remove "unlikely", as suggested by Bjorn Helgaas. 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 (!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; -- 2.17.1 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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 CBB86C43381 for ; Mon, 25 Mar 2019 22:19:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 99A5E20811 for ; Mon, 25 Mar 2019 22:19:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jWamSCqX"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="Ri/IWHh+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99A5E20811 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=umn.edu Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Q5GEd/SrpTJ0acVYYc+1tWKgi5TyU+VUB0FyxgbWn08=; b=jWamSCqXDzSVRNT5x0S7V4aNiB 6ye+Y/J+dQPSxlHpe1NexmVauVmEvR+x92j93kaj3hUPamJvA4QFSgPWqZEQR08hTk2MmulfXnzQy 8VUSHW5J9cfCRR9pseCrG6YGbkpMniNJ1FHacdovVN4lhp8B/xY3+1+PBsIEsjdb0m/R2/w/vqMTP nQe73OLCnJKeza0saiA9GO/Qsqe1p0BF0U8HFPpcPBVm60SyHwCpb9jqA6ZxgG0Ggqfwiw/5cTCNg eFDRKAcizFejqr6+7G5G02lDuxqW8Ip0QQY80Qs+YaaIvMq+DoeP+rkWXbOqyuEvuzmKacR82aVZy ZPP/uy0A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8XwF-00080f-8A; Mon, 25 Mar 2019 22:19:27 +0000 Received: from mta-p8.oit.umn.edu ([134.84.196.208]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Xw8-0007zB-7y for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 22:19:23 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id B87A46C6 for ; Mon, 25 Mar 2019 22:19:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r1446OGlrIgq for ; Mon, 25 Mar 2019 17:19:15 -0500 (CDT) Received: from mail-it1-f197.google.com (mail-it1-f197.google.com [209.85.166.197]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 88CF5179 for ; Mon, 25 Mar 2019 17:19:15 -0500 (CDT) Received: by mail-it1-f197.google.com with SMTP id q184so9813440itd.6 for ; Mon, 25 Mar 2019 15:19:15 -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=wMN6xXX31A6AdzQAJGc2vG9ofT3CoZG7Cbz+jNnp6f8=; b=Ri/IWHh+UZOTC7ZjY4+AHxTHHeE03LtftP/f73T6u1Ndc5c/G84oyC5h/XcypurBr/ m3txydiTyFZKrl9mX6le7RxJygALM1cd+VCRmv553UxKXOPiLu8qlHsLW6VQ/2GnfwF2 KrkNM+srVDJNlpryuymtMSzPYP3kgwtrXzmHqu+RxPVPspOm7GeAEu+Skr9X5YXgKZLU DJta+7ZXNvdYf8U5t4Oiqvrw8GBrbsWn5ZWkM8THTE7wJvHxzX/TSidF6fYMEWa+5fR6 3zU+Kjn1+zbCNW3i7102e1rCdCkh0VJ4XapJQ7aqKBYlZPptSpcitFAsgaXnscRksF0Q Sezg== 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=wMN6xXX31A6AdzQAJGc2vG9ofT3CoZG7Cbz+jNnp6f8=; b=MZS0rSGyVP0TS3KUx+6odYexWbdSHp96jotTOETJ5zBTjaVnt2r5mhCcZAZ0FnEFSo NXdelw8IqwiDePzjOkXTN628fWFgQpMOGvIiEeuTES/AZxVifgs5x9XNOgJAwml9RZ0E FPbXBCT88nEHZxeAH5VtPKo6msVZN+XkftMlvvY72c57XDa2Vdl/sq1gvz9Ti9QkWulb A86eHEau0/Q3lEtyE/e4SIe7yVFh//+KlzAZqrsaFQmwalC3HTBBa0wXazDOFvf3ZLlS o5sZVW9hrThdVSH/DeRy2KGITci8hBbUTjw4+sFWvx8snVWRP+x7zh97sLtG3yAMtiAM FsQA== X-Gm-Message-State: APjAAAW6FCR0AH2wfG+oeLAcUSJSJumOy7uHzRtSJKe4gK/AiVrDedt1 KZPh2sEOnp6GWagwLjO8zuhA7LdN50f4baWrFA9myxZrjJ+JQU1mRw8Uk6tcwVMYrgVX5KQVVeE LBhXgp90bQkGQbjqKDGbYlJZ5x49AeguL8wqgo7M= X-Received: by 2002:a6b:e50d:: with SMTP id y13mr16967272ioc.142.1553552355183; Mon, 25 Mar 2019 15:19:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyJpikc1k86UuAZEIpBOenvhqms6j6+SUAXP6kJ8lTR9Ao9sezT7dyXG/DCDzkMGqenPZaMnw== X-Received: by 2002:a6b:e50d:: with SMTP id y13mr16967256ioc.142.1553552354910; Mon, 25 Mar 2019 15:19:14 -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 k4sm10043741itc.32.2019.03.25.15.19.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 15:19:14 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Subject: [PATCH v3] PCI: xilinx: Check for __get_free_pages() failure Date: Mon, 25 Mar 2019 17:19:09 -0500 Message-Id: <20190325221909.26315-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190325215105.GB24180@google.com> References: <20190325215105.GB24180@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_151920_381034_7C8B9C0B X-CRM114-Status: GOOD ( 15.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , linux-pci@vger.kernel.org, Michal Simek , linux-kernel@vger.kernel.org, pakki001@umn.edu, Bjorn Helgaas , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org If __get_free_pages() fails, the patch returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- v3: remove "unlikely", as suggested by Bjorn Helgaas. 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 (!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; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel