Message ID | 20200601174019.735903176@linuxfoundation.org |
---|---|
State | New |
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,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 795D0C433E1 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 17:59:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4288520776 for <stable@archiver.kernel.org>; Mon, 1 Jun 2020 17:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034349; bh=16yhCeybFa9voEegXBLnbz8WkBZ0IGi5Ct0ZVHsiUMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rePDlGchwW3mTSS1px57rJRiX5pSqqkRpVDRbdrLqCf1DLHL6mljjmJqmtxy/98Kw YQuCU28Ma0PBKTcvEFISGg+KC/bgZqDwQMGtDLDOccdP4KZ9lhtficagvN53/CM4nc ZBBs6jYtHddH5RDsubUaDVn1ZGeTFk+2scvCr8HE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728614AbgFAR7I (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 1 Jun 2020 13:59:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:41398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729298AbgFAR7G (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 1 Jun 2020 13:59:06 -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 6A0D12073B; Mon, 1 Jun 2020 17:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034344; bh=16yhCeybFa9voEegXBLnbz8WkBZ0IGi5Ct0ZVHsiUMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j1JknxeaRouQl6Rpb+o8jnCssSbHVOVVNLhS9C11l4STUphLFXy92N25VD3aHsvmW 3JN1Jc3SvNGFoGRGh+ix4z5plA2+3eY39qkCZqjxctDVDcT5Ow0Jga37nUFbB3IzWq bS6tHDyRf//aTT3WSqJexyjySPpmjsOMDlwGlrrw= 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.9 44/61] x86/dma: Fix max PFN arithmetic overflow on 32 bit systems Date: Mon, 1 Jun 2020 19:53:51 +0200 Message-Id: <20200601174019.735903176@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174010.316778377@linuxfoundation.org> References: <20200601174010.316778377@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 @@ -73,7 +73,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 */