From patchwork Fri Apr 16 09:20:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella via Libc-alpha X-Patchwork-Id: 422471 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp220868jaf; Fri, 16 Apr 2021 02:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiToitiDfrRXkfLfepyeEEM7TOMalAmHFDi0zOJw5z1PwoQHFEx0cYHlxTc2Wd6fUOIdtG X-Received: by 2002:a17:906:c09:: with SMTP id s9mr7422277ejf.145.1618564844565; Fri, 16 Apr 2021 02:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618564844; cv=none; d=google.com; s=arc-20160816; b=uTT2LfkxbUjvT4M1NuDvyN1Yra0uDR/kaJp++o1/CQkdyP9dINvIRO//emrpEFyBZu CIYlzeL1m7vez8rHwhRLbBF4iMeSN/GJLp+0Z873unXDd0n2FtL/DEu5f/258dk1BT3i Z6tz8cDvcnS0ORiTxK5Rf2JtVZAcqgRCe/jC5UXK5oz14vCSj5bCeS4qWdbm/76qFfJx YaPu894R/E+/rFwWYtIQBmQr/4SBu7+eri/P0uvnnJUK5ecuS6Kogl3ZCnYikEGYFXls pkfMHMonssaubaJ+oOI+/NFUuEccNeSyDi4bXZDOBWItqeYw2GwT6FrxMOCjDsOocW8P X2cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :user-agent:date:message-id:references:in-reply-to:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=v0y0YyG9QbNPdt38R1/V8fuO2Aa+yXTQ/1zAxMdgwd4=; b=rRVfAy6cJvtnaGI4hfE9RTGkDbBDOtcZdhBh+zw7AmP6O34iJ8TkdCLjl/OtbcHoXs YCmZGkFBpn8i+VeU0et7rFRz1aUe6psUBDhs7grx2ZQwRUxE9Dy1Mbh97NgPcpxbDmAX 9s1i7EtxgTbWqeMxS4Wdg0QT7kOEROEMiuGkfgLe2p9l+WS9t2wt51XxXdUOahlyU4sn EL9HiqIEZBSkHAdBRdP3r8aiKnGlh9DuQ1jwI8GmCbm5tDsPZGJV+zklb7CV8M29DvhD G/Xc60QVNAzvQM+Y7BLjvV+/wV4apxm8bMEY6Z5h9mATYgd++rgp+zOX4E7QiyD34evs e6Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="KhTj12/p"; spf=pass (google.com: domain of libc-alpha-bounces@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom=libc-alpha-bounces@sourceware.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Return-Path: Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id r3si4901666eda.505.2021.04.16.02.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 02:20:44 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="KhTj12/p"; spf=pass (google.com: domain of libc-alpha-bounces@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom=libc-alpha-bounces@sourceware.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 804B6389202F; Fri, 16 Apr 2021 09:20:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 804B6389202F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618564836; bh=v0y0YyG9QbNPdt38R1/V8fuO2Aa+yXTQ/1zAxMdgwd4=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=KhTj12/pf9MyizulGZFDCHBsUci+XJYv1gQF26BKYeGscTelAcH7xN6PdlNujaqFB al9BYzAjZondCYsF7OmkkNOYmvNeB87k9oX7qvPR1upyGz9C13rOSkvcqCupoekH2J Lw6nfRW0owFL3ihOy5LkR3YlWugldS0q01MqzXag= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id A0B8A3892018 for ; Fri, 16 Apr 2021 09:20:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A0B8A3892018 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-lnkAQmZ1PaSgFbAqdnVHWQ-1; Fri, 16 Apr 2021 05:20:27 -0400 X-MC-Unique: lnkAQmZ1PaSgFbAqdnVHWQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 992B9107ACCD for ; Fri, 16 Apr 2021 09:20:26 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F26AD5C3F8 for ; Fri, 16 Apr 2021 09:20:25 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v4 06/37] x86: Restore compile-time check for shadow stack pointer in longjmp In-Reply-To: References: Message-Id: <5bea1ee880296716d66c854e5509fe8cae2dddfa.1618564630.git.fweimer@redhat.com> Date: Fri, 16 Apr 2021 11:20:43 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Adhemerval Zanella via Libc-alpha Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Adhemerval Zanella --- sysdeps/unix/sysv/linux/x86/longjmp.c | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/x86/longjmp.c -- 2.30.2 diff --git a/sysdeps/unix/sysv/linux/x86/longjmp.c b/sysdeps/unix/sysv/linux/x86/longjmp.c new file mode 100644 index 0000000000..1cc8b8dfad --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/longjmp.c @@ -0,0 +1,39 @@ +/* __libc_siglongjmp for Linux/x86 + Copyright (C) 2018-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +#include +#include + +#ifdef __x86_64__ +# define SHADOW_STACK_POINTER_SIZE 8 +#else +# define SHADOW_STACK_POINTER_SIZE 4 +#endif + +/* Assert that the priv field in struct pthread_unwind_buf has space + to store shadow stack pointer. */ +_Static_assert ((offsetof (struct pthread_unwind_buf, priv) + <= SHADOW_STACK_POINTER_OFFSET) + && ((offsetof (struct pthread_unwind_buf, priv) + + sizeof (((struct pthread_unwind_buf *) 0)->priv)) + >= (SHADOW_STACK_POINTER_OFFSET + + SHADOW_STACK_POINTER_SIZE)), + "Shadow stack pointer is not within private storage " + "of pthread_unwind_buf.");