This is a note to let you know that I've just added the patch titled
oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
to the 3.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
oprofile-x86-fix-wrapping-bug-in-op_x86_get_ctrl.patch
and it can be found in the queue-3.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 44009105081b51417f311f4c3be0061870b6b8ed Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Wed, 10 Oct 2012 10:18:35 +0300
Subject: oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
From: Dan Carpenter <[email protected]>
commit 44009105081b51417f311f4c3be0061870b6b8ed upstream.
The "event" variable is a u16 so the shift will always wrap to zero
making the line a no-op.
Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Robert Richter <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/x86/oprofile/nmi_int.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -55,7 +55,7 @@ u64 op_x86_get_ctrl(struct op_x86_model_
val |= counter_config->extra;
event &= model->event_mask ? model->event_mask : 0xFF;
val |= event & 0xFF;
- val |= (event & 0x0F00) << 24;
+ val |= (u64)(event & 0x0F00) << 24;
return val;
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.6/oprofile-x86-fix-wrapping-bug-in-op_x86_get_ctrl.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
