From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbbCWMUs (ORCPT ); Mon, 23 Mar 2015 08:20:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41166 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752685AbbCWMUo (ORCPT ); Mon, 23 Mar 2015 08:20:44 -0400 Date: Mon, 23 Mar 2015 05:20:19 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, luto@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@alien8.de, torvalds@linux-foundation.org, spender@grsecurity.net, dvlasenk@redhat.com Reply-To: mingo@kernel.org, luto@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, spender@grsecurity.net, bp@alien8.de, dvlasenk@redhat.com In-Reply-To: <33e5107085ce347a8303560302b15c2cadd62c4c.1426728647.git.luto@kernel.org> References: <33e5107085ce347a8303560302b15c2cadd62c4c.1426728647.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry, perf: Fix incorrect TIF_IA32 check in code_segment_base() Git-Commit-ID: c56716af8d27ca8dd6e45445ae1c0a05fd9753a6 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: c56716af8d27ca8dd6e45445ae1c0a05fd9753a6 Gitweb: http://git.kernel.org/tip/c56716af8d27ca8dd6e45445ae1c0a05fd9753a6 Author: Andy Lutomirski AuthorDate: Wed, 18 Mar 2015 18:33:28 -0700 Committer: Ingo Molnar CommitDate: Mon, 23 Mar 2015 10:08:21 +0100 x86/asm/entry, perf: Fix incorrect TIF_IA32 check in code_segment_base() We want to check whether user code is in 32-bit mode, not whether the task is nominally 32-bit. Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brad Spengler Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/33e5107085ce347a8303560302b15c2cadd62c4c.1426728647.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index b71a7f8..979963b 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -2161,10 +2161,9 @@ static unsigned long code_segment_base(struct pt_regs *regs) if (user_mode(regs) && regs->cs != __USER_CS) return get_segment_base(regs->cs); #else - if (test_thread_flag(TIF_IA32)) { - if (user_mode(regs) && regs->cs != __USER32_CS) - return get_segment_base(regs->cs); - } + if (user_mode(regs) && !user_64bit_mode(regs) && + regs->cs != __USER32_CS) + return get_segment_base(regs->cs); #endif return 0; }