From mboxrd@z Thu Jan  1 00:00:00 1970
From: Keir Fraser <keir.xen@gmail.com>
Subject: Re: [PATCH] x86: fix bug_line()
Date: Fri, 11 Oct 2013 18:17:20 +0100
Message-ID: <CE7DF130.3938E%keir.xen@gmail.com>
References: <5258349A02000078000FAA6E@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.bemta14.messagelabs.com ([193.109.254.103])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <keir.xen@gmail.com>) id 1VUgLJ-0000wb-GZ
	for xen-devel@lists.xenproject.org; Fri, 11 Oct 2013 17:17:37 +0000
Received: by mail-pb0-f44.google.com with SMTP id xa7so4499363pbc.17
	for <xen-devel@lists.xenproject.org>;
	Fri, 11 Oct 2013 10:17:34 -0700 (PDT)
In-Reply-To: <5258349A02000078000FAA6E@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 11/10/2013 16:25, "Jan Beulich" <JBeulich@suse.com> wrote:

> Due to the packing into a bit field together with a relocated field,
> the computation can overflow when the relocated field ends up getting a
> negative value stored. Hence it isn't sufficient to correct the value
> by 1 in this case, but we also need to mask the result to the width of
> the original bit field.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

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

> --- a/xen/include/asm-x86/bug.h
> +++ b/xen/include/asm-x86/bug.h
> @@ -15,9 +15,11 @@ struct bug_frame {
>  
>  #define bug_loc(b) ((const void *)(b) + (b)->loc_disp)
>  #define bug_ptr(b) ((const void *)(b) + (b)->ptr_disp)
> -#define bug_line(b) ((((b)->line_hi + ((b)->loc_disp < 0)) <<
> \
> +#define bug_line(b) (((((b)->line_hi + ((b)->loc_disp < 0)) &
> \
> +                       ((1 << BUG_LINE_HI_WIDTH) - 1)) <<
> \
>                        BUG_LINE_LO_WIDTH) +
> \
> -                     (b)->line_lo + ((b)->ptr_disp < 0))
> +                     (((b)->line_lo + ((b)->ptr_disp < 0)) &
> \
> +                      ((1 << BUG_LINE_LO_WIDTH) - 1)))
>  #define bug_msg(b) ((const char *)(b) + (b)->msg_disp[1])
>  
>  #define BUGFRAME_run_fn 0
> 
> 
>