From patchwork Fri Nov 13 02:46:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Collingbourne X-Patchwork-Id: 11902413 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 BF41EC55ABD for ; Fri, 13 Nov 2020 02:47:08 +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 45CC1204EF for ; Fri, 13 Nov 2020 02:47:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fB6W0mZH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="EvfTo0ed" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45CC1204EF 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=l6L1wyu+3mtBhyXHlv5IOUpMvsHi4NcWUpPfe7pMxeM=; b=fB6W0mZH/RECsc+3QVGrQ616L QT38fe6GzNyE9P2Q4wUE3SVp+BWC7qE1lFH5uNzV5Gt5/WygQZENSfZPAZC8l+P9eO8Vuo2ox9DkQ b8ho+/KnT9FUc04fsBrZkWjzxLVgOFIVfpuEEkEpoMtu08CWuTqsb8Bc4pg5c8z7MVHjLQNUIOmb6 hznFzUq2CeZhTu2p5cYjupN8/qCqISZzOw63An0GT1JfxNqBUSuerQFsFhGe9F32EBKmOH7FW6dRf QxLp+HizC1u34HbIDGqz5eOHjOOKiwXo2WCrzrOEtc5iwqyE06Vx/sAvvFDUxywjtXO8of1CFsoMb vUNpuwRtw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdP6l-0002kJ-DI; Fri, 13 Nov 2020 02:46:39 +0000 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdP6X-0002g0-2W for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 02:46:26 +0000 Received: by mail-pl1-x649.google.com with SMTP id g2so4971920plg.1 for ; Thu, 12 Nov 2020 18:46:23 -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=lUEiJXSYZDs6+Qn4UpsCZYPeFsNKuEieQkr3dWS75aY=; b=EvfTo0edUqDuBAriOPubmF24MEjI11rQynQHXK2nawtmRsuJHmiK0ornX1yfNMfKA1 SehoGzrCPBkjSpEy5cuPZ0Bwiw2UZg9kadTP4lRbgR++7POZy6ZNzi0khyUC1Lr+/sNu mDU7+c/d9zWrhImaTLAevDWi+1EGECHTQS5b0LuWEOZ2HgM9wBU5T52+DSyA0mZ0vZ2L 9ZD0OwHT5li9+fVLa3eau7lWkfgRDedORgfo6vQSSEJ5PLutNnvMttcrkbwd3aWXq6ep rbWeYVC0iGheOf/Buq3foMvoL0nX+/X3NJCaounE0udQAr1UCO37w4lIfo54RdB34Cqb eE5w== 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=lUEiJXSYZDs6+Qn4UpsCZYPeFsNKuEieQkr3dWS75aY=; b=KnH9rm2LI7VOttA9Frf+hCXO4EjQ9PlotVphqfHD/8pcSujphF2J5VEo17Jd9qwCEG LxlxT6DPd7dJTI1SO7C0mp8aj4C27xOx1+nOVS+OBhBIKC/IKVOOk4lGKnveMieeCHGn sWyhntwxBhqAVLYhbhlObcYfol3j5RJhL8PI4L26xLLqBN1+9mEZHk41bbfPiCCYHorF PEpRGUSvxSz5gN6RYgj+XOWTcV9JokMw8iHSUjPgrHyoMZdXHryzaWJCJC3y31ntmFKm Qcza7IyuNSWYb1HcqVOwNsxWF0PHEPYjc7JcBHrdRN0w95p8Atx4rV/h+N8vTvyNrl1D Gm6w== X-Gm-Message-State: AOAM530YR5BC7MWApXa75aZjgy4ybt2kz8ymTXKHyIVxR3by4nkD4Sxa cfHJKdSyK25kVnYRdpeN3+7g/cI= X-Google-Smtp-Source: ABdhPJwLOzxpq1YXrc2y7i4Sw4OIP3nv7cbZzPmE2fmQN1OfADzGqbV9TwzOWbCYl6Covu6iciL+p18= X-Received: from pcc-desktop.svl.corp.google.com ([2620:15c:2ce:0:7220:84ff:fe09:385a]) (user=pcc job=sendgmr) by 2002:a05:6a00:1684:b029:18b:665e:5211 with SMTP id k4-20020a056a001684b029018b665e5211mr150458pfc.20.1605235581478; Thu, 12 Nov 2020 18:46:21 -0800 (PST) Date: Thu, 12 Nov 2020 18:46:06 -0800 In-Reply-To: Message-Id: <3581410892be6851d804bbbb84fccf06073f1262.1605235488.git.pcc@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH v15 5/6] 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-20201112_214625_200486_8B3E42A5 X-CRM114-Status: GOOD ( 17.60 ) 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 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