linux-kernel - [tip:perf/core] perf/x86: Fix undefined shift on 32-bit kernels

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-6d6f2833bfbf296101f9f085e10488aef2601ba5@git.kernel.org>
Date:	Thu, 12 May 2016 03:34:14 -0700
From:	tip-bot for Andrey Ryabinin <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	acme@...hat.com, torvalds@...ux-foundation.org,
	aryabinin@...tuozzo.com, eranian@...gle.com,
	vincent.weaver@...ne.edu, peterz@...radead.org, tglx@...utronix.de,
	stable@...r.kernel.org, jolsa@...hat.com, imrep@...zon.de,
	hpa@...or.com, alexander.shishkin@...ux.intel.com,
	jim.cromie@...il.com, linux-kernel@...r.kernel.org,
	mingo@...nel.org
Subject: [tip:perf/core] perf/x86: Fix undefined shift on 32-bit kernels

Commit-ID:  6d6f2833bfbf296101f9f085e10488aef2601ba5
Gitweb:     http://git.kernel.org/tip/6d6f2833bfbf296101f9f085e10488aef2601ba5
Author:     Andrey Ryabinin <aryabinin@...tuozzo.com>
AuthorDate: Wed, 11 May 2016 16:51:51 +0300
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 12 May 2016 10:14:31 +0200

perf/x86: Fix undefined shift on 32-bit kernels

Jim reported:

	UBSAN: Undefined behaviour in arch/x86/events/intel/core.c:3708:12
	shift exponent 35 is too large for 32-bit type 'long unsigned int'

The use of 'unsigned long' type obviously is not correct here, make it
'unsigned long long' instead.

Reported-by: Jim Cromie <jim.cromie@...il.com>
Signed-off-by: Andrey Ryabinin <aryabinin@...tuozzo.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: <stable@...r.kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Imre Palik <imrep@...zon.de>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Fixes: 2c33645d366d ("perf/x86: Honor the architectural performance monitoring version")
Link: http://lkml.kernel.org/r/1462974711-10037-1-git-send-email-aryabinin@virtuozzo.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/events/intel/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index a6fd4db..5210eaa 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3708,7 +3708,7 @@ __init int intel_pmu_init(void)
 				c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1;
 			}
 			c->idxmsk64 &=
-				~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));
+				~(~0ULL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));
 			c->weight = hweight64(c->idxmsk64);
 		}
 	}