From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC1553F8F4; Mon, 1 Apr 2024 16:35:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711989326; cv=none; b=Onnn9Dwq65iK1SvvUCzqgbQBVl6FMKxsXgZ5bjkVFUNUqmfWVYWop613z+q4ro3LBHZhIsVmagHN3fZAqUrmsohMSwawIZJtHgHvt9L7/nXpW1AMCYrc8HoMUJAKv2AfSd5G7FLUONH+z68qEw2QMSU1gdMigItI1HyCICSSzq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711989326; c=relaxed/simple; bh=nci64xSo8jmEKqSYjgpT0yr7pgo1vz6lyoKG4K621ng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iHpwcUm2bYnVVo9gC6lZttlTRzHx5w42Ya54pyrBk3GR9GguLebVspF7rfpDX4GlQneYKsHYYcW90pVjLgtDKKQAXl5cT3pUkOLBsB6ddrg/3o4Br4akt3F/89gxWYJbosYK5OZ3qXoZHt3s4ov12qM71xqGBJQ3FjdJV1i3xq0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TOBfI3jH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TOBfI3jH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9569CC433F1; Mon, 1 Apr 2024 16:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711989326; bh=nci64xSo8jmEKqSYjgpT0yr7pgo1vz6lyoKG4K621ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TOBfI3jHwcKLU0E/olyqOaxJF0LfO/pJ07XirTIKiYvnUTyM7/xtPm4iUoVADDS7C 7NOa5NVyLVikNrI73zF6NrGDSY1cb3E4O9HFv91dGkF+AHPSwED2S9ay5V3gzsLEiR bkQtpI2N3LgFonZcCptNjSJ+HJGhdd9gcazB1+fI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Danilo Krummrich , Arnd Bergmann , Philipp Stanner , Bjorn Helgaas , Arnd Bergmann , Sasha Levin Subject: [PATCH 6.6 016/396] pci_iounmap(): Fix MMIO mapping leak Date: Mon, 1 Apr 2024 17:41:05 +0200 Message-ID: <20240401152548.377803284@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152547.867452742@linuxfoundation.org> References: <20240401152547.867452742@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Philipp Stanner [ Upstream commit 7626913652cc786c238e2dd7d8740b17d41b2637 ] The #ifdef ARCH_HAS_GENERIC_IOPORT_MAP accidentally also guards iounmap(), which means MMIO mappings are leaked. Move the guard so we call iounmap() for MMIO mappings. Fixes: 316e8d79a095 ("pci_iounmap'2: Electric Boogaloo: try to make sense of it all") Link: https://lore.kernel.org/r/20240131090023.12331-2-pstanner@redhat.com Reported-by: Danilo Krummrich Suggested-by: Arnd Bergmann Signed-off-by: Philipp Stanner Signed-off-by: Bjorn Helgaas Reviewed-by: Arnd Bergmann Cc: # v5.15+ Signed-off-by: Sasha Levin --- lib/pci_iomap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c index ce39ce9f3526e..2829ddb0e316b 100644 --- a/lib/pci_iomap.c +++ b/lib/pci_iomap.c @@ -170,8 +170,8 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *p) if (addr >= start && addr < start + IO_SPACE_LIMIT) return; - iounmap(p); #endif + iounmap(p); } EXPORT_SYMBOL(pci_iounmap); -- 2.43.0