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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,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 CF1EDC433B4 for ; Wed, 21 Apr 2021 13:07:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B3A361463 for ; Wed, 21 Apr 2021 13:07:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241160AbhDUNIX (ORCPT ); Wed, 21 Apr 2021 09:08:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:47630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240943AbhDUNGS (ORCPT ); Wed, 21 Apr 2021 09:06:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E53B761458; Wed, 21 Apr 2021 13:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619010345; bh=2ycM2uqfzYjMsQHL5ct7JTX4bBiNqWZl4SpNrvgt/xY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CxZuPXI3UsCbXn614XGcMFA65pBwOHtRis8EVc/mryA9nR2jZQ4UKofNGC4mEf65y BmLnhC1wbuHGnuIRQsCMHeGpZuRdAKmi8o2wc5qHIaompYiLllo8DnAhStRrQo7qJm vsqnHkD0mB6tHavi9z52+H9P0bN+2vl3VD6ygHtA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Kangjie Lu , Lorenzo Pieralisi , Steven Price , Mukesh Ojha Subject: [PATCH 101/190] Revert "PCI: xilinx: Check for __get_free_pages() failure" Date: Wed, 21 Apr 2021 14:59:36 +0200 Message-Id: <20210421130105.1226686-102-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210421130105.1226686-1-gregkh@linuxfoundation.org> References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 699ca30162686bf305cdf94861be02eb0cf9bda2. Commits from @umn.edu addresses have been found to be submitted in "bad faith" to try to test the kernel community's ability to review "known malicious" changes. The result of these submissions can be found in a paper published at the 42nd IEEE Symposium on Security and Privacy entitled, "Open Source Insecurity: Stealthily Introducing Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University of Minnesota) and Kangjie Lu (University of Minnesota). Because of this, all submissions from this group must be reverted from the kernel tree and will need to be re-reviewed again to determine if they actually are a valid fix. Until that work is complete, remove this change to ensure that no problems are being introduced into the codebase. Cc: Kangjie Lu Cc: Lorenzo Pieralisi Cc: Steven Price Cc: Mukesh Ojha Signed-off-by: Greg Kroah-Hartman --- drivers/pci/controller/pcie-xilinx.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c index fa5baeb82653..942c25bf7980 100644 --- a/drivers/pci/controller/pcie-xilinx.c +++ b/drivers/pci/controller/pcie-xilinx.c @@ -326,19 +326,14 @@ static const struct irq_domain_ops msi_domain_ops = { * xilinx_pcie_enable_msi - Enable MSI support * @port: PCIe port information */ -static int xilinx_pcie_enable_msi(struct xilinx_pcie_port *port) +static void 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 */ @@ -493,7 +488,6 @@ 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); @@ -522,9 +516,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port) return -ENODEV; } - ret = xilinx_pcie_enable_msi(port); - if (ret) - return ret; + xilinx_pcie_enable_msi(port); } return 0; -- 2.31.1