From mboxrd@z Thu Jan  1 00:00:00 1970
From: Keir Fraser <keir.xen@gmail.com>
Subject: Re: [PATCH] x86/MTRR: fix range check in mtrr_add_page()
Date: Tue, 13 Aug 2013 18:34:44 +0100
Message-ID: <CE302CC4.5AC16%keir.xen@gmail.com>
References: <520A709D02000078000EB977@nat28.tlf.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <keir.xen@gmail.com>) id 1V9IUd-0002hX-2w
	for xen-devel@lists.xenproject.org; Tue, 13 Aug 2013 17:34:51 +0000
Received: by mail-ea0-f181.google.com with SMTP id d10so4281354eaj.26
	for <xen-devel@lists.xenproject.org>;
	Tue, 13 Aug 2013 10:34:49 -0700 (PDT)
In-Reply-To: <520A709D02000078000EB977@nat28.tlf.novell.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Jan Beulich <JBeulich@suse.com>, xen-devel <xen-devel@lists.xenproject.org>
List-Id: xen-devel@lists.xenproject.org

On 13/08/2013 16:45, "Jan Beulich" <JBeulich@suse.com> wrote:

> Extracted from Yinghai Lu's Linux commit d5c78673 ("x86: Fix /proc/mtrr
> with base/size more than 44bits").
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Keir Fraser <keir@xen.org>

> --- a/xen/arch/x86/cpu/mtrr/main.c
> +++ b/xen/arch/x86/cpu/mtrr/main.c
> @@ -340,7 +340,7 @@ int mtrr_add_page(unsigned long base, un
> return -EINVAL;
> }
>  
> - if (base & size_or_mask || size & size_or_mask) {
> + if ((base | (base + size - 1)) >> (paddr_bits - PAGE_SHIFT)) {
> printk(KERN_WARNING "mtrr: base or size exceeds the MTRR width\n");
> return -EINVAL;
> }
> 
> 
>