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=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 5A862C169C4 for ; Mon, 11 Feb 2019 16:14:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29E1F21B1C for ; Mon, 11 Feb 2019 16:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549901686; bh=Qn6hyg7jchgSP9EQyg3kGXUYhfGl0tLm+GCvKxyKyh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lcxj98PqK6Ek91eq+0cHEEm7KlmJHq1VeWis3IBnwYFwJRr8q8dsmsv98qgh3w1g3 ps3l7lC6rMZQvOSFwH4rh8YD3qaQV/C51u2qmk4IEzV+kQZyv5pVZpLEC8/B6Rstd0 YC1VQK7/tcqczFmA1kmsnzrSfpA4kTlBEHJuxq+I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728751AbfBKOWb (ORCPT ); Mon, 11 Feb 2019 09:22:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:55322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727389AbfBKOWZ (ORCPT ); Mon, 11 Feb 2019 09:22:25 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1CA6020838; Mon, 11 Feb 2019 14:22:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549894944; bh=Qn6hyg7jchgSP9EQyg3kGXUYhfGl0tLm+GCvKxyKyh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cDAnpXo9IyOSnCPD5EipbOidnvdrscAfph49W6gkYz2I5WjaMpUKDqez8P4w9Ebf2 y4R70dd3fqw21ubx1NHQpuiRtq65/SfxP6+FFSlTdJsJh38NcBnL0hfxY+bnJMnrGX MPUyUDL1cdBOgY/91gs4C2FO0wmQmF9MaDJjR0uM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anatolij Gustschin , Alan Tull , Sasha Levin Subject: [PATCH 4.20 039/352] fpga: altera-cvp: fix bad IO access on x86_64 Date: Mon, 11 Feb 2019 15:14:26 +0100 Message-Id: <20190211141848.807196746@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 187fade88ca0ff2df9d360ca751d948d73db7095 ] If mapping the CvP BAR fails, we still can configure the FPGA via PCI config space access. In this case the iomap pointer is NULL. On x86_64, passing NULL address to pci_iounmap() generates "Bad IO access at port 0x0" output with stack call trace. Fix it. Signed-off-by: Anatolij Gustschin Acked-by: Alan Tull Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/fpga/altera-cvp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c index 36d79b039c57..35c3aa5792e2 100644 --- a/drivers/fpga/altera-cvp.c +++ b/drivers/fpga/altera-cvp.c @@ -478,7 +478,8 @@ static int altera_cvp_probe(struct pci_dev *pdev, return 0; err_unmap: - pci_iounmap(pdev, conf->map); + if (conf->map) + pci_iounmap(pdev, conf->map); pci_release_region(pdev, CVP_BAR); err_disable: cmd &= ~PCI_COMMAND_MEMORY; @@ -493,7 +494,8 @@ static void altera_cvp_remove(struct pci_dev *pdev) u16 cmd; fpga_mgr_unregister(mgr); - pci_iounmap(pdev, conf->map); + if (conf->map) + pci_iounmap(pdev, conf->map); pci_release_region(pdev, CVP_BAR); pci_read_config_word(pdev, PCI_COMMAND, &cmd); cmd &= ~PCI_COMMAND_MEMORY; -- 2.19.1