From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A51FEC63798 for ; Wed, 25 Nov 2020 01:15:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6AA3A216C4 for ; Wed, 25 Nov 2020 01:15:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="nI+fOXdb"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="8IlHSkYF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727799AbgKYBP0 (ORCPT ); Tue, 24 Nov 2020 20:15:26 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:46742 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725320AbgKYBP0 (ORCPT ); Tue, 24 Nov 2020 20:15:26 -0500 Date: Wed, 25 Nov 2020 01:15:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606266923; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iOFdo/J4Apf0WQ2fIbAgwQsZ4YIRFHwosTd2xizv2QA=; b=nI+fOXdbb3CvlS/oChTBOdNxDkrFez9Mung/n+TacNY771X1ErCoJUwsfC2L/13KbE09qC rkorqi5rYgIJ8dLZ86CkOFTymdV3eWDVr+FdQHYEWGUmhlFWM8Uwy76i+xw2PPZ3ODFnWZ ITZfi4aRClchWl8sjEqUBQBBxkJlVoq+e8GLVmNa+stAEUU+jvwAxw6093aSf1glRPaChd Vfn+ng9pQ3Er6+D9NrrwViAktOIVd5dteeXSIHfl5RZpNFzFZh0xbqK3G3AIzrNTRUttU0 uqG3FFrioJSZCLIoeiF8SWBwEFfy2buQwl35im53YJSmc278JXGC8ZGTOQ0aIA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606266923; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iOFdo/J4Apf0WQ2fIbAgwQsZ4YIRFHwosTd2xizv2QA=; b=8IlHSkYFoja/drPjQjE8p8M/HgSIxEQIDf0obBDNHuAMeRKn0ez8waBSq7EVDF7fcd3lc9 ykLMtoqMuL7kJMDQ== From: "tip-bot2 for Gabriel Krisman Bertazi" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/entry] entry: Fix boot for !CONFIG_GENERIC_ENTRY Cc: Naresh Kamboju , Jann Horn , Gabriel Krisman Bertazi , Thomas Gleixner , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <87a6v8qd9p.fsf_-_@collabora.com> References: <87a6v8qd9p.fsf_-_@collabora.com> MIME-Version: 1.0 Message-ID: <160626692283.3364.16416416609704664088.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/entry branch of tip: Commit-ID: 0395124a2fbff5132afee5767071ebe7e05885ac Gitweb: https://git.kernel.org/tip/0395124a2fbff5132afee5767071ebe7e05885ac Author: Gabriel Krisman Bertazi AuthorDate: Mon, 23 Nov 2020 10:54:58 -05:00 Committer: Thomas Gleixner CommitterDate: Tue, 24 Nov 2020 23:44:28 +01:00 entry: Fix boot for !CONFIG_GENERIC_ENTRY A copy-pasta mistake tries to set SYSCALL_WORK flags instead of TIF flags for !CONFIG_GENERIC_ENTRY. Also, add safeguards to catch this at compilation time. Fixes: 3136b93c3fb2 ("entry: Expose helpers to migrate TIF to SYSCALL_WORK flags") Reported-by: Naresh Kamboju Suggested-by: Jann Horn Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Thomas Gleixner Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/87a6v8qd9p.fsf_-_@collabora.com --- include/linux/thread_info.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 3173632..5515ab3 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -35,6 +35,7 @@ enum { GOOD_STACK, }; +#ifdef CONFIG_GENERIC_ENTRY enum syscall_work_bit { SYSCALL_WORK_BIT_SECCOMP, SYSCALL_WORK_BIT_SYSCALL_TRACEPOINT, @@ -48,6 +49,7 @@ enum syscall_work_bit { #define SYSCALL_WORK_SYSCALL_TRACE BIT(SYSCALL_WORK_BIT_SYSCALL_TRACE) #define SYSCALL_WORK_SYSCALL_EMU BIT(SYSCALL_WORK_BIT_SYSCALL_EMU) #define SYSCALL_WORK_SYSCALL_AUDIT BIT(SYSCALL_WORK_BIT_SYSCALL_AUDIT) +#endif #include @@ -129,11 +131,11 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag) #else /* CONFIG_GENERIC_ENTRY */ #define set_syscall_work(fl) \ - set_ti_thread_flag(current_thread_info(), SYSCALL_WORK_##fl) + set_ti_thread_flag(current_thread_info(), TIF_WORK_##fl) #define test_syscall_work(fl) \ - test_ti_thread_flag(current_thread_info(), SYSCALL_WORK_##fl) + test_ti_thread_flag(current_thread_info(), TIF_WORK_##fl) #define clear_syscall_work(fl) \ - clear_ti_thread_flag(current_thread_info(), SYSCALL_WORK_##fl) + clear_ti_thread_flag(current_thread_info(), TIF_WORK_##fl) #define set_task_syscall_work(t, fl) \ set_ti_thread_flag(task_thread_info(t), TIF_##fl)