From patchwork Mon Jan 31 18:55:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1586939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=uKH82ex0; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JncpK7577z9s8q for ; Tue, 1 Feb 2022 06:00:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CB614394908C for ; Mon, 31 Jan 2022 19:00:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB614394908C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1643655639; bh=JM9W8LTfc58bdiINwQT+keFsNBiIRA7CZSTuXiNb0y4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=uKH82ex0VrL3/hFU8ZVbz+6TntjaNVLAg4QKYWBm8kCEtMKgHZqc9HznmtZO1U+/j 8iT4hNstMMTtIl6D/puDRLtHLfv6qvyWeZxvMgDM7+X55chDUlBgDX2Jeqqn+f7LH0 Avhms48YDNEV3inxuHe4kujkhHj7vXiSi0R08cR0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by sourceware.org (Postfix) with ESMTPS id BC45A3857815 for ; Mon, 31 Jan 2022 18:55:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BC45A3857815 Received: by mail-pj1-x1029.google.com with SMTP id g11-20020a17090a7d0b00b001b2c12c7273so433545pjl.0 for ; Mon, 31 Jan 2022 10:55:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JM9W8LTfc58bdiINwQT+keFsNBiIRA7CZSTuXiNb0y4=; b=Hh6B6pb5R6Kxrpd3ZYWVX4khb4c2GoMH6810npQmvuZAlrJW0heLpUJl7mava5dIyD iPlu6sBq1KBuo+PUvTOZnpZvfZtjrhbJqcpScQxX5qqa8kSeN0FYnNYRJ0IrNQXEBUNe cXIcizxfaasAVcAp8GbY9MFwdY7AZVQxGOvHkZU+T9gmEBKkyWWNRCZMGeBdQ2u4XsiO +DRwjwlyAOo2vIqJv/9RWMEnljpqY0ckhVlCZd3g/NRUWpPjF13Bzgnzwq54zAEv/PvV dZSAmSkKMwXia3PqC4bmCUxUOc4OMHleLkFErRhbhbSo+fv9ea5/sCT8ylcoXOoxhu6j JcUg== X-Gm-Message-State: AOAM533JaEOKk3DZq3r00ssydAQtFZ6q7LUZ4tQS051MNoC7ohU4h9lA d+aFfspUCAuzdCpOGXcSHpkrBMi2Pvg= X-Google-Smtp-Source: ABdhPJy7T2bcP2YcLBOO/edbWM8fv8dfReME7xOoPcJhuSPBHrSTatUrQ6sOP49uUmo40/hncorxbw== X-Received: by 2002:a17:902:ea10:: with SMTP id s16mr21458427plg.167.1643655331680; Mon, 31 Jan 2022 10:55:31 -0800 (PST) Received: from gnu-tgl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id 8sm94883pji.4.2022.01.31.10.55.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 10:55:31 -0800 (PST) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id 336E03004A7 for ; Mon, 31 Jan 2022 10:55:28 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [GCC 11 PATCH 5/5] x86: Generate INT3 for __builtin_eh_return Date: Mon, 31 Jan 2022 10:55:28 -0800 Message-Id: <20220131185528.619688-6-hjl.tools@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220131185528.619688-1-hjl.tools@gmail.com> References: <20220131185528.619688-1-hjl.tools@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3028.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Generate INT3 after indirect jmp in exception return for -fcf-protection with -mharden-sls=indirect-jmp. gcc/ PR target/103925 * config/i386/i386.c (ix86_output_indirect_function_return): Generate INT3 after indirect jmp for -mharden-sls=indirect-jmp. gcc/testsuite/ PR target/103925 * gcc.target/i386/harden-sls-6.c: New test. (cherry picked from commit c2e5c4feed32c808591b5278f680bbabe63eb225) --- gcc/config/i386/i386.c | 9 ++++++--- gcc/testsuite/gcc.target/i386/harden-sls-6.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-6.c diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 35dbe05aecd..e6261452365 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -16072,11 +16072,14 @@ ix86_output_indirect_function_return (rtx ret_op) } else output_indirect_thunk (regno); - - return ""; } else - return "%!jmp\t%A0"; + { + output_asm_insn ("%!jmp\t%A0", &ret_op); + if (ix86_harden_sls & harden_sls_indirect_jmp) + fputs ("\tint3\n", asm_out_file); + } + return ""; } /* Output the assembly for a call instruction. */ diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-6.c b/gcc/testsuite/gcc.target/i386/harden-sls-6.c new file mode 100644 index 00000000000..9068eb64008 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/harden-sls-6.c @@ -0,0 +1,18 @@ +/* { dg-do compile { target { ! ia32 } } } */ +/* { dg-options "-O2 -fcf-protection -mharden-sls=indirect-jmp" } */ + +struct _Unwind_Context _Unwind_Resume_or_Rethrow_this_context; + +void offset (int); + +struct _Unwind_Context { + void *reg[7]; +} _Unwind_Resume_or_Rethrow() { + struct _Unwind_Context cur_contextcur_context = + _Unwind_Resume_or_Rethrow_this_context; + offset(0); + __builtin_eh_return ((long) offset, 0); +} + +/* { dg-final { scan-assembler "jmp\[ \t\]+\\*%rcx" } } */ +/* { dg-final { scan-assembler-times "int3" 1 } } */