From patchwork Mon Jan 11 03:12:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 41690 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D53D53851416; Mon, 11 Jan 2021 03:12:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D53D53851416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1610334737; bh=/2mQOv40ee0gCPQmcdirCrOU+W3DtplFFLt3+kRJFH0=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=elgS6qc4pNlgLozzJ4eHGH9xa+pKdnwzoSbqf1PVjqsZSM+rS7k51SDEhVxYu1Tuk Tafk5h0MRnuIrl6MwuAvkVT9Ggxh+ozHlkxvirCMEuecwgBShB1Qfcfe/3WT5/gqVD +md8EGiimuepJgKZ+nJPc+cInXpaJtuT6v/yIj+M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by sourceware.org (Postfix) with ESMTPS id 98C49385480A for ; Mon, 11 Jan 2021 03:12:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 98C49385480A Received: by mail-qt1-x849.google.com with SMTP id a11so12219475qto.16 for ; Sun, 10 Jan 2021 19:12:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=/2mQOv40ee0gCPQmcdirCrOU+W3DtplFFLt3+kRJFH0=; b=j9ig/LKH/oL3Hr45qyUX0dJKZoJyO3fxslpufgslJCa8H6HaxEdcAdl5WAqK2efnC+ HMmhfFXunrAvPimOUEXmmYVC9xjx67k+9u5XxZ7qawg6H9PP0PzA6DLT4/D0TsOQKxKn +ivqQhCo2lnWbpvstFwQz7pbJLvWu5dyLrkjhJK+RmV3Cm8YG3WDlXx+ltDsxo+TOQFJ glneO7c/AmitBfjDCGtYoRhGzp00Hly7KCZhEn/FMw0zUM9u/sz54ta6rhWQsMcf9Nwb CTArJlXsDeKW9vlUIe3tUKX7SV60im2rQhaudU4spLvvnQwGzmw3Tlcbzs/dDtCA6APx em5g== X-Gm-Message-State: AOAM533P2dOqD07DvEi/687otixWZWAsoFgHAxpoi/d8SC1UzRxgLJ9t WK4ajEcbQQ3r+1JnTac8TAIZXut52Qi7DsNBSBsVMgI+n+U3ZtpYO35DqxGO09KRK6TCE/NXbAN KT4KHozwkW4BwXgU5YQqYpUqKLH78Z3Y1SV99qx+2NC8yQiLlOBVDZiys0vOt5EOyPVoI X-Google-Smtp-Source: ABdhPJzuoZ0WnrbAQwN9DfOqaGvrSdNDgwRaPt3kj92g9b725W+PM7EzDooKTdVmoIf75C34UfIf8nKeF3Td X-Received: from maskray1.svl.corp.google.com ([2620:15c:2ce:0:a6ae:11ff:fe11:4abb]) (user=maskray job=sendgmr) by 2002:a05:6214:14af:: with SMTP id bo15mr13715984qvb.19.1610334734036; Sun, 10 Jan 2021 19:12:14 -0800 (PST) Date: Sun, 10 Jan 2021 19:12:10 -0800 Message-Id: <20210111031210.4020603-1-maskray@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH] Unconditionally define __stack_chk_guard [BZ #26817] To: libc-alpha@sourceware.org X-Spam-Status: No, score=-18.8 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL 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: Fangrui Song via Libc-alpha From: Fangrui Song Reply-To: Fangrui Song Cc: Fangrui Song Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This makes -mstack-protector-guard=global work even if -mstack-protector-guard=tls is the default. --- csu/libc-start.c | 8 ++------ elf/rtld.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/csu/libc-start.c b/csu/libc-start.c index db859c3bed..e46d402664 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -33,11 +33,8 @@ extern void __libc_init_first (int argc, char **argv, char **envp); #include #ifndef SHARED # include -# ifndef THREAD_SET_STACK_GUARD -/* Only exported for architectures that don't store the stack guard canary - in thread local area. */ +/* Also export to architectures which prefer -mstack-protector-guard=tls. */ uintptr_t __stack_chk_guard attribute_relro; -# endif # ifndef THREAD_SET_POINTER_GUARD /* Only exported for architectures that don't store the pointer guard value in thread local area. */ @@ -206,9 +203,8 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); -# else +# endif __stack_chk_guard = stack_chk_guard; -# endif # ifdef DL_SYSDEP_OSCHECK { diff --git a/elf/rtld.c b/elf/rtld.c index 8d9add90e3..cd70428c46 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -154,11 +154,8 @@ unsigned int _dl_skip_args attribute_relro attribute_hidden; #endif rtld_hidden_data_def (_dl_argv) -#ifndef THREAD_SET_STACK_GUARD -/* Only exported for architectures that don't store the stack guard canary - in thread local area. */ +/* Also export to architectures which prefer -mstack-protector-guard=tls. */ uintptr_t __stack_chk_guard attribute_relro; -#endif /* Only exported for architectures that don't store the pointer guard value in thread local area. */ @@ -865,9 +862,8 @@ security_init (void) uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); #ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); -#else +#endif __stack_chk_guard = stack_chk_guard; -#endif /* Set up the pointer guard as well, if necessary. */ uintptr_t pointer_chk_guard