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.7 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 9FE65C64E7C for ; Wed, 2 Dec 2020 09:40:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 510D42222A for ; Wed, 2 Dec 2020 09:40:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388454AbgLBJkM (ORCPT ); Wed, 2 Dec 2020 04:40:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728186AbgLBJjv (ORCPT ); Wed, 2 Dec 2020 04:39:51 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22BC7C061A48; Wed, 2 Dec 2020 01:38:31 -0800 (PST) Date: Wed, 02 Dec 2020 09:38:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606901908; 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=bsQud75acz2sIkEQYVG+Hdi0B02U84I8Zot75FVsthY=; b=sMEYPF9IZLO7fX7rlfp+qKEpcWMSiDMvSHNVPM9cm749YTtH48dJJZA5IPDApIkwQgPNGm I+TRgzLhkmR9gjaI5roPUZMerJWXFkDGsr38O69LAzByX3hHhN83QnWF4A9/Zy97fxl58B bc8UeBfiV6tvZsLKoKSSB/mi2y7Cqgw6IsPjpLyaMEx4n4tzQT0kPuJwJ9sfqY9luYMFII /VEoGDYWbt+FfNx3GI1E5BJQHujkUCqofsatm5rW+8mFqAD/tPCpkaBUd+/QJ4uNEa2Hoq 1qSW7MZumneRk21MVhLUd2r5wwxOUUL1PBEWNoko8VImxt3VxLCAFjVDpQIsCg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606901908; 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=bsQud75acz2sIkEQYVG+Hdi0B02U84I8Zot75FVsthY=; b=VjzVumNRHcYnDWtBsMQlgZSeLR3l6RSLL+hS28LOLXPKqhZwVoYisqbOpIdlpkClbOQBjx NebYVNF82025SSBw== 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] signal: Expose SYS_USER_DISPATCH si_code type Cc: Gabriel Krisman Bertazi , Thomas Gleixner , Andy Lutomirski , Kees Cook , Christian Brauner , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201127193238.821364-3-krisman@collabora.com> References: <20201127193238.821364-3-krisman@collabora.com> MIME-Version: 1.0 Message-ID: <160690190781.3364.9203452575091866466.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: 1d7637d89cfce54a4f4a41c2325288c2f47470e8 Gitweb: https://git.kernel.org/tip/1d7637d89cfce54a4f4a41c2325288c2f47470e8 Author: Gabriel Krisman Bertazi AuthorDate: Fri, 27 Nov 2020 14:32:33 -05:00 Committer: Thomas Gleixner CommitterDate: Wed, 02 Dec 2020 10:32:16 +01:00 signal: Expose SYS_USER_DISPATCH si_code type SYS_USER_DISPATCH will be triggered when a syscall is sent to userspace by the Syscall User Dispatch mechanism. This adjusts eventual BUILD_BUG_ON around the tree. Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Thomas Gleixner Reviewed-by: Andy Lutomirski Acked-by: Kees Cook Acked-by: Christian Brauner Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20201127193238.821364-3-krisman@collabora.com --- arch/x86/kernel/signal_compat.c | 2 +- include/uapi/asm-generic/siginfo.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c index a7f3e12..d7b5187 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c @@ -31,7 +31,7 @@ static inline void signal_compat_build_tests(void) BUILD_BUG_ON(NSIGBUS != 5); BUILD_BUG_ON(NSIGTRAP != 5); BUILD_BUG_ON(NSIGCHLD != 6); - BUILD_BUG_ON(NSIGSYS != 1); + BUILD_BUG_ON(NSIGSYS != 2); /* This is part of the ABI and can never change in size: */ BUILD_BUG_ON(sizeof(compat_siginfo_t) != 128); diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h index 7aacf93..d259700 100644 --- a/include/uapi/asm-generic/siginfo.h +++ b/include/uapi/asm-generic/siginfo.h @@ -286,7 +286,8 @@ typedef struct siginfo { * SIGSYS si_codes */ #define SYS_SECCOMP 1 /* seccomp triggered */ -#define NSIGSYS 1 +#define SYS_USER_DISPATCH 2 /* syscall user dispatch triggered */ +#define NSIGSYS 2 /* * SIGEMT si_codes