From patchwork Tue Nov 3 04:09:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 11875883 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 0C635C4742C for ; Tue, 3 Nov 2020 04:11:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A355322245 for ; Tue, 3 Nov 2020 04:11:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EWJ69kbk"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="hFAEBQgh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A355322245 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tOz/uHN87IV0WXjr679zSljx9T8oqNlNJ1ixAenPxT4=; b=EWJ69kbk7fshLbzucFjH7H6qR YORcUMcL7jnG1HKIcEyIzQgdTlAJdhPWCq1ZJS6hklnpKOehe7RUjANN5bwq2IwKgXGqkb/ENonMP UiDyKZ3MzH5NBTgoQZrCqB2JPW00YhPh7e9hBTJ7X2zpp6YWJVTas9oEhw72IQ8P8R1oHOD8L/Q0D AHBofNQh+SJEYyNlEQ6a56RQCWNeOrBLhUGmakJxSnFXbo59AjbjdivPWusTHepc0r4HDfg4i/+Eg lvtTF7m2erlJHDM56R6YED8NYshWXAKEormo8y4ScUgez8KV1zNWEfo7PGVFN3nJYoiK3OYUylw+0 KwrgYJFAA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZneN-0001eM-8m; Tue, 03 Nov 2020 04:10:27 +0000 Received: from mail-qv1-xf49.google.com ([2607:f8b0:4864:20::f49]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZneC-0001Ze-LF for linux-arm-kernel@lists.infradead.org; Tue, 03 Nov 2020 04:10:17 +0000 Received: by mail-qv1-xf49.google.com with SMTP id s4so3749276qvn.9 for ; Mon, 02 Nov 2020 20:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=kxh8h3N2DC9f05BY16jRtsQux5LoEptNxLPFbLaVubI=; b=hFAEBQghSZm3DrkgGFeB6eSjBetEddg9g+LwnvX75dYJES+T/0yW2dl8pXaN/dN2Ux GY5mOyL02G1nWaVDCa8dI6dvcXOjeER9QvxSM8Lgpr/YHNcUkhLZlWFpke3VgHxnoll1 zToWEbjYJe79OOfgesLRKhtQxGfPbbiUQ3ZTSU3GHCqsURhJTJbgoxL3/ewZ7sFdXOi6 fldOAD92YJVQfI7pc0byytqxSzHQPtiDDmochrNe4EtpSUDRCvYx0UACGhGJFOBl8IEU zNNvZ+D+SjmfRkLZSFkOBVy2LxRr1TvXZcQOhaR9xnAaFzW6kgt2yiK2rplHYcR5OX6f Ajtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=kxh8h3N2DC9f05BY16jRtsQux5LoEptNxLPFbLaVubI=; b=MtxASWA+r3EFn5r1IyCBNcjS2ivneJppHVbyJxviQjHUzpo0ekPzmG2abQ0UpC08ck 8CL8qf5/uYts2MmVK4yFPG/2lbkjmss4gA5vQy6terA9j/UdbapDYBv7pAk1WqgjkImT NgfeiWaGD7ysekr1d9ECEnesGU9fREAZdCMPgmYepxZG0Zik6BZmp2yxEBTcxCQvKCYa 5CXu6UUzoIAqarMkjWuC/qAGD+Y8J5T3GZ/EfkYW7yLYzcYOPveOMDeUGlPal+TpD1pm QDUELaiwaDgfpzoLSeYQ8cZG1xKV0eLH64tXToYLO27TJSq6IUmaxclLR9oGf+c3feQq v4wQ== X-Gm-Message-State: AOAM532matcwuPwaTv7VPxJbdQDGQgG9fIRklwokxp5OyvYL8BtjIjeJ osUtI+E8kGuMdqDMJKPqHDjJfs8= X-Google-Smtp-Source: ABdhPJxDs2ct5LqoAJ8mGfvMmTa0bm63rH+4VBhrcMeDsQKIdobEezYvI3XoFYwGyX0lK6GSTaugJyQ= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:0:7220:84ff:fe09:385a]) (user=pcc job=sendgmr) by 2002:a05:6214:192d:: with SMTP id es13mr23963347qvb.27.1604376613013; Mon, 02 Nov 2020 20:10:13 -0800 (PST) Date: Mon, 2 Nov 2020 20:09:41 -0800 In-Reply-To: Message-Id: <832bc45b5636cdb40e079fbfacfed5650749c07a.1604376407.git.pcc@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v13 5/8] signal: define the SA_UNSUPPORTED bit in sa_flags From: Peter Collingbourne To: Catalin Marinas , Evgenii Stepanov , Kostya Serebryany , Vincenzo Frascino , Dave Martin , Will Deacon , Oleg Nesterov , "Eric W. Biederman" , "James E.J. Bottomley" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201102_231016_783750_DD16E359 X-CRM114-Status: GOOD ( 17.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Konovalov , Helge Deller , Kevin Brodsky , linux-api@vger.kernel.org, David Spickett , Peter Collingbourne , Linux ARM , Richard Henderson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Define a sa_flags bit, SA_UNSUPPORTED, which will never be supported in the uapi. The purpose of this flag bit is to allow userspace to distinguish an old kernel that does not clear unknown sa_flags bits from a kernel that supports every flag bit. In other words, if userspace does something like: act.sa_flags |= SA_UNSUPPORTED; sigaction(SIGSEGV, &act, 0); sigaction(SIGSEGV, 0, &oldact); and finds that SA_UNSUPPORTED remains set in oldact.sa_flags, it means that the kernel cannot be trusted to have cleared unknown flag bits from sa_flags, so no assumptions about flag bit support can be made. Signed-off-by: Peter Collingbourne Reviewed-by: Dave Martin Link: https://linux-review.googlesource.com/id/Ic2501ad150a3a79c1cf27fb8c99be342e9dffbcb --- v11: - clarify the commit message include/uapi/asm-generic/signal-defs.h | 7 +++++++ kernel/signal.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h index 493953fe319b..0126ebda4d31 100644 --- a/include/uapi/asm-generic/signal-defs.h +++ b/include/uapi/asm-generic/signal-defs.h @@ -14,6 +14,12 @@ * SA_RESTART flag to get restarting signals (which were the default long ago) * SA_NODEFER prevents the current signal from being masked in the handler. * SA_RESETHAND clears the handler when the signal is delivered. + * SA_UNSUPPORTED is a flag bit that will never be supported. Kernels from + * before the introduction of SA_UNSUPPORTED did not clear unknown bits from + * sa_flags when read using the oldact argument to sigaction and rt_sigaction, + * so this bit allows flag bit support to be detected from userspace while + * allowing an old kernel to be distinguished from a kernel that supports every + * flag bit. * * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single * Unix names RESETHAND and NODEFER respectively. @@ -42,6 +48,7 @@ #ifndef SA_RESETHAND #define SA_RESETHAND 0x80000000 #endif +#define SA_UNSUPPORTED 0x00000400 #define SA_NOMASK SA_NODEFER #define SA_ONESHOT SA_RESETHAND diff --git a/kernel/signal.c b/kernel/signal.c index 8f5bd12ee41b..8f34819e80de 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3985,6 +3985,12 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) if (oact) *oact = *k; + /* + * Make sure that we never accidentally claim to support SA_UNSUPPORTED, + * e.g. by having an architecture use the bit in their uapi. + */ + BUILD_BUG_ON(UAPI_SA_FLAGS & SA_UNSUPPORTED); + /* * Clear unknown flag bits in order to allow userspace to detect missing * support for flag bits and to allow the kernel to use non-uapi bits