Commit ff6a3586 authored by Colin Ian King's avatar Colin Ian King Committed by sanglipeng
Browse files

perf/x86/amd: fix potential integer overflow on shift of a int 

stable inclusion
from stable-v5.10.166
commit f84c9b72fb200633774704d8020f769c88a4b249
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f84c9b72fb200633774704d8020f769c88a4b249



--------------------------------

commit 08245672 upstream.

The left shift of int 32 bit integer constant 1 is evaluated using 32 bit
arithmetic and then passed as a 64 bit function argument. In the case where
i is 32 or more this can lead to an overflow.  Avoid this by shifting
using the BIT_ULL macro instead.

Fixes: 471af006 ("perf/x86/amd: Constrain Large Increment per Cycle events")
Signed-off-by: default avatarColin Ian King <colin.i.king@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarKim Phillips <kim.phillips@amd.com>
Link: https://lore.kernel.org/r/20221202135149.1797974-1-colin.i.king@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 6f8bcaa6

arch/x86/events/amd/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ static int __init amd_core_pmu_init(void) 
		 * numbered counter following it.

		 */

		for (i = 0; i < x86_pmu.num_counters - 1; i += 2)

			even_ctr_mask |= 1 << i;

			even_ctr_mask |= BIT_ULL(i);



		pair_constraint = (struct event_constraint)

				    __EVENT_CONSTRAINT(0, even_ctr_mask, 0,