Message ID | 20200601174025.781995133@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=Ycwd=7O=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,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 B6A08C433DF for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:55:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9380B206C3 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 18:55:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591037718; bh=N0l1RPeo1SlGImHH28ykJupX+PqrhocXisBt8WWswmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iGyS1vfZmvTIHQsBVZdsJyLJamqCrCtvLxPB8YvMuN1iZgM9YoZ85vqnOHwO7yqEH HAwIQX4BL0KwW1oq1PtrAPofa70wcUVhI9hMqPZkPiqfhPg3RuxH0BMrgoG6eMvUTk xmJMHVM0SC48cJyeK7XYI+/mVKEzGBVKgMD0DpOI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728263AbgFASzJ (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 14:55:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:44512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729809AbgFASBd (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 14:01:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 A96112073B; Mon, 1 Jun 2020 18:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034492; bh=N0l1RPeo1SlGImHH28ykJupX+PqrhocXisBt8WWswmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wwnwf/Jo+VibTriLs5Utn45Ttqj9o4n6flB9xvlXTtYhsnSaMJ8+TVaHrm+FFhGTT Y+7I8Wtt4+XmJp+m6SkuL2AD/GnZoD82suGN2M1Bhn//W2CPHC6ib17xZuQcSVuj5R V5h6bU/wSgaa/nVGCk7JTXMssQqZpmYEhMLzIFR8= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Alan Jenkins <alan.christopher.jenkins@gmail.com>, Robin Murphy <robin.murphy@arm.com>, Alexander Dahl <post@lespocky.de>, Borislav Petkov <bp@suse.de> Subject: [PATCH 4.14 54/77] x86/dma: Fix max PFN arithmetic overflow on 32 bit systems Date: Mon, 1 Jun 2020 19:53:59 +0200 Message-Id: <20200601174025.781995133@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174016.396817032@linuxfoundation.org> References: <20200601174016.396817032@linuxfoundation.org> User-Agent: quilt/0.66 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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/arch/x86/include/asm/dma.h +++ b/arch/x86/include/asm/dma.h @@ -74,7 +74,7 @@ #define MAX_DMA_PFN ((16UL * 1024 * 1024) >> PAGE_SHIFT) /* 4GB broken PCI/AGP hardware bus master zone */ -#define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT) +#define MAX_DMA32_PFN (1UL << (32 - PAGE_SHIFT)) #ifdef CONFIG_X86_32 /* The maximum address that we can perform a DMA transfer to on this platform */