From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967696AbdAKPr3 (ORCPT ); Wed, 11 Jan 2017 10:47:29 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55420 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbdAKPqk (ORCPT ); Wed, 11 Jan 2017 10:46:40 -0500 Date: Wed, 11 Jan 2017 07:46:01 -0800 From: tip-bot for Colin King Message-ID: Cc: tglx@linutronix.de, colin.king@canonical.com, mingo@kernel.org, peterz@infradead.org, kan.liang@intel.com, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, ak@linux.intel.com, eranian@google.com, hpa@zytor.com Reply-To: ak@linux.intel.com, alexander.shishkin@linux.intel.com, eranian@google.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, colin.king@canonical.com, linux-kernel@vger.kernel.org, kan.liang@intel.com, peterz@infradead.org In-Reply-To: <20170111114310.17928-1-colin.king@canonical.com> References: <20170111114310.17928-1-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel: Use ULL constant to prevent undefined shift behaviour Git-Commit-ID: ad5013d5699d30ded0cdbbc68b93b2aa28222c6e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ad5013d5699d30ded0cdbbc68b93b2aa28222c6e Gitweb: http://git.kernel.org/tip/ad5013d5699d30ded0cdbbc68b93b2aa28222c6e Author: Colin King AuthorDate: Wed, 11 Jan 2017 11:43:10 +0000 Committer: Thomas Gleixner CommitDate: Wed, 11 Jan 2017 16:43:30 +0100 perf/x86/intel: Use ULL constant to prevent undefined shift behaviour When x86_pmu.num_counters is 32 the shift of the integer constant 1 is exceeding 32bit and therefor undefined behaviour. Fix this by shifting 1ULL instead of 1. Reported-by: CoverityScan CID#1192105 ("Bad bit shift operation") Signed-off-by: Colin Ian King Cc: Andi Kleen Cc: Peter Zijlstra Cc: Kan Liang Cc: Stephane Eranian Cc: Alexander Shishkin Link: http://lkml.kernel.org/r/20170111114310.17928-1-colin.king@canonical.com Signed-off-by: Thomas Gleixner --- 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 8613826..d611cab 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3987,7 +3987,7 @@ __init int intel_pmu_init(void) x86_pmu.num_counters, INTEL_PMC_MAX_GENERIC); x86_pmu.num_counters = INTEL_PMC_MAX_GENERIC; } - x86_pmu.intel_ctrl = (1 << x86_pmu.num_counters) - 1; + x86_pmu.intel_ctrl = (1ULL << x86_pmu.num_counters) - 1; if (x86_pmu.num_counters_fixed > INTEL_PMC_MAX_FIXED) { WARN(1, KERN_ERR "hw perf events fixed %d > max(%d), clipping!",