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,URIBL_BLOCKED,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 7E712C43381 for ; Sat, 23 Mar 2019 21:04:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E304217D8 for ; Sat, 23 Mar 2019 21:04:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="I4Ef8XT/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728028AbfCWVE2 (ORCPT ); Sat, 23 Mar 2019 17:04:28 -0400 Received: from mta-p5.oit.umn.edu ([134.84.196.205]:52412 "EHLO mta-p5.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727770AbfCWVE2 (ORCPT ); Sat, 23 Mar 2019 17:04:28 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 25B2BCBB for ; Sat, 23 Mar 2019 21:04:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TyOuG-Km715d for ; Sat, 23 Mar 2019 16:04:27 -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-p5.oit.umn.edu (Postfix) with ESMTPS id E7E50CBF for ; Sat, 23 Mar 2019 16:04:26 -0500 (CDT) Received: by mail-it1-f197.google.com with SMTP id 190so5585615itv.3 for ; Sat, 23 Mar 2019 14:04:26 -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; bh=5wG4f1fEkLp966T1bSVeSK99W1Qeu2nVeK0taNfKzzQ=; b=I4Ef8XT/jnbi+tMmAHG5WICb8qdNlNkhEGeMnG7BX2cTmGzsbQWhpaDzogleFYvnOn FTiGI9G++d4xNJ5aq4XKaWU3JUrelm+iFniQ8rZjxWdhm5LST/Dd3EyHgJn2uobP4Ue2 cqoNk5Bl+C2B+g8lToWMhw+4SDodFTvbBlxbhFM/GYYBuUmOiN7Yp+K8Yw9HuOr3A4v5 /WELYfLIaJnThcKTxv2kHZJNZmzh5YNVpkYgbwDfL4XRL14z8OTA7FPqFqtkdnR3nkKF 08Zdij3YbRiPw8FIqp68WCWtGpZg5wpjP3BkfJbsZVI7uXg91tmcxqATbDhF7IkX01N9 v17A== 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; bh=5wG4f1fEkLp966T1bSVeSK99W1Qeu2nVeK0taNfKzzQ=; b=VGfN7mtaUWdeTHdw0Cw4a6b7dvEhJd9/LHORR0FDRu+LJml6LKG9/NX3TJAbz2TGt2 TVz0gv+Vv3hHuJ63khTTl2NmSimNuEUPnll9V2Pi2UlLOOQHGnmJLdZQe58adLuFC2Ka xdfe8qk14VvIaN+1OxdQEsQRPk2ez9SGPShf+uH4m5XxMGf2yLG4WF4YRxloDc0a4Qi9 +uYZS/rtEY5OS74FAEyd20E26VJws5CZYWfoKfQHSlZsUb/XGdwYsGAqP+vmIqVhslIv kaZlHeCW+6PZ2BWTdIOd9Lzg7nVXDmyspBZiIX2mKBnoLtC8po77tot+J6awxQuc1FGe ZPmA== X-Gm-Message-State: APjAAAUNBmBXwVhOhTp0JA61pzwprxH2FIxxzKqEINZkM2F78x9RcXpl 98RpF3pNgJrbIwhXlva+8jM4OmK020LGAwmahk4kjGl1R6RG0F0P7pAB1NflqHAjbOy86cnHk1+ 29pK6+fdpH37LySe+QwUC7RBvRby9 X-Received: by 2002:a05:660c:711:: with SMTP id l17mr3140856itk.92.1553375066578; Sat, 23 Mar 2019 14:04:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxy0U8g+TJEXWruwMJ6yj9GVhNXSU4I56D1uDEFVkrDtIqQ32mirdf4BRi6O68CHL7dEMQkZA== X-Received: by 2002:a05:660c:711:: with SMTP id l17mr3140846itk.92.1553375066381; Sat, 23 Mar 2019 14:04:26 -0700 (PDT) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id c1sm3344399itd.23.2019.03.23.14.04.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 14:04:25 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@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: Sat, 23 Mar 2019 16:04:23 -0500 Message-Id: <20190323210423.8881-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case __get_free_pages fail, the fix returns error upstream to avoid NULL pointer dereference. Signed-off-by: Aditya Pakki --- v1: Return error upstream as suggested by Steven --- drivers/pci/controller/pcie-xilinx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c index 9bd1a35cd5d8..91d8945bfb0c 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -335,15 +335,19 @@ static const struct irq_domain_ops msi_domain_ops = { /** * xilinx_pcie_enable_msi - Enable MSI support * @port: PCIe port information + * Return: 0 on success, negative error on failure */ -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 +502,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 +531,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=DKIMWL_WL_HIGH,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 C993AC43381 for ; Sat, 23 Mar 2019 21:04:39 +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 94AFB217D8 for ; Sat, 23 Mar 2019 21:04:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rpISfE3m"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="I4Ef8XT/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94AFB217D8 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: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:In-Reply-To: References:List-Owner; bh=Q5k+Kd6EQ4EHLRZmvJ5MFmer0qIaaHWQIFzlaHMek7I=; b=rpI SfE3mzRBEkTY3gBkwNsIE6SKIcLFqffIx1nu9A90Yg/v44cfux7DphMZlVKanI1Ri8k58G9AamCiB Cmw8u2vh89FS/4Yf67vkuI8olGThmE3rCUFpWHvA3Y+lNxNH6eo3ONZiKy9X+yIYXnejC9I+IkTcO +LVfExtzDisEcjFcOe6/uRVRrpmxkuiDX64ZsXo6mOFFG1cZTO9DwnN3U5mP1HWyPTdYtrrdwzC+k MZsmZRbLXNbnrnofTEqwI91sP9OoCJoTRTQANhihWiQKDA0TndDJO5m59nuImo3XMh6jvfSyh/08q VfPd3aEuh4vKhADpbd9XXyFxD+la8ig==; 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 1h7nof-0007SC-G8; Sat, 23 Mar 2019 21:04:33 +0000 Received: from mta-p6.oit.umn.edu ([134.84.196.206]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7nob-0007RQ-DF for linux-arm-kernel@lists.infradead.org; Sat, 23 Mar 2019 21:04:31 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 1D5C6718 for ; Sat, 23 Mar 2019 21:04:27 +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 7hHm1CxNX9Ai for ; Sat, 23 Mar 2019 16:04:27 -0500 (CDT) Received: from mail-it1-f200.google.com (mail-it1-f200.google.com [209.85.166.200]) (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 E0B8183C for ; Sat, 23 Mar 2019 16:04:26 -0500 (CDT) Received: by mail-it1-f200.google.com with SMTP id e63so5606055ita.1 for ; Sat, 23 Mar 2019 14:04:26 -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; bh=5wG4f1fEkLp966T1bSVeSK99W1Qeu2nVeK0taNfKzzQ=; b=I4Ef8XT/jnbi+tMmAHG5WICb8qdNlNkhEGeMnG7BX2cTmGzsbQWhpaDzogleFYvnOn FTiGI9G++d4xNJ5aq4XKaWU3JUrelm+iFniQ8rZjxWdhm5LST/Dd3EyHgJn2uobP4Ue2 cqoNk5Bl+C2B+g8lToWMhw+4SDodFTvbBlxbhFM/GYYBuUmOiN7Yp+K8Yw9HuOr3A4v5 /WELYfLIaJnThcKTxv2kHZJNZmzh5YNVpkYgbwDfL4XRL14z8OTA7FPqFqtkdnR3nkKF 08Zdij3YbRiPw8FIqp68WCWtGpZg5wpjP3BkfJbsZVI7uXg91tmcxqATbDhF7IkX01N9 v17A== 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; bh=5wG4f1fEkLp966T1bSVeSK99W1Qeu2nVeK0taNfKzzQ=; b=RrVXXt8mZtFt4ow/gWf2SfOLPJgWPdQ+f2s9NwVkXAMQjmmsnw9B5H7xYl7RLLFxFx FVar8A5954rMYHEMcPcEEn+UF7owqL103P2j6vzod/58bf/gD7CRdFc388SYR6OujGfs caDgLlf4dXFpz5D4WMHPUCcV/XITvRwR3iuFtXbAn908e2FeXKZVlDrL/2/MIpdTqmYv yrrDM5+fjoimsJMMSbWCmQLAl0dTho5QCb2X7KyhseFfCbcvkowuibxqUeC4cGSQgMvU CEvtRNMYeenaMyPJub1qSBV+se6N6t6rJwPklYrNybjhkHxn6ApkTbd+gBxp4wmFBOB+ LaSw== X-Gm-Message-State: APjAAAUKV6iL20BzAcKxlbvN4FJ0dqBY3E9dqdAkF0q8v9IDxZfjTy3P GJxHylvqYV/Mnvw7TtnUOQkdUklV/489EmULmc7yLUqItryYNb6XJ0Z6e23q8NPkSGALfNRlB3o MQF575Y5gz5IJv2XUfWp+qvseO0hqRaufRD65yDM= X-Received: by 2002:a05:660c:711:: with SMTP id l17mr3140854itk.92.1553375066578; Sat, 23 Mar 2019 14:04:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxy0U8g+TJEXWruwMJ6yj9GVhNXSU4I56D1uDEFVkrDtIqQ32mirdf4BRi6O68CHL7dEMQkZA== X-Received: by 2002:a05:660c:711:: with SMTP id l17mr3140846itk.92.1553375066381; Sat, 23 Mar 2019 14:04:26 -0700 (PDT) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id c1sm3344399itd.23.2019.03.23.14.04.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 14:04:25 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Subject: [PATCH v2] pci: pcie-xilinx: fix a missing-check bug for __get_free_pages Date: Sat, 23 Mar 2019 16:04:23 -0500 Message-Id: <20190323210423.8881-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190323_140429_536499_18B7C7F8 X-CRM114-Status: GOOD ( 13.58 ) 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, kjlu@umn.edu, Michal Simek , linux-kernel@vger.kernel.org, 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 In case __get_free_pages fail, the fix returns error upstream to avoid NULL pointer dereference. Signed-off-by: Aditya Pakki --- v1: Return error upstream as suggested by Steven --- drivers/pci/controller/pcie-xilinx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c index 9bd1a35cd5d8..91d8945bfb0c 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -335,15 +335,19 @@ static const struct irq_domain_ops msi_domain_ops = { /** * xilinx_pcie_enable_msi - Enable MSI support * @port: PCIe port information + * Return: 0 on success, negative error on failure */ -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 +502,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 +531,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