From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by sourceware.org (Postfix) with ESMTPS id B89B7386F432 for ; Wed, 13 Jan 2021 12:58:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B89B7386F432 Received: by mail-qk1-x72f.google.com with SMTP id v126so1347703qkd.11 for ; Wed, 13 Jan 2021 04:58:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=clGD5o9x1j5IesxQC07NlZODnWDAjL5GSL3/ZFWUAZ0=; b=teKnRvHiE2LohTwnjwYsuNJjTG6gA/jmIlvLIHO89pmGg2Esi/fQczA0Jx/HmXpXHc N27I9sCywtBO3jAjvPfKDHqSq2DAR+mYIxPS9ROTMiwB4CUBw3MFNoVdGJ3+Co1oaN2Y yPc46Hd3+VX3jWCFBtBk3ORtBgMUbxWIhhVUCnKow++ApgBk1o95sneWRpz6awBodeff tcRCK5Cy0CsM63xdpu8aCIFlyEZWutEQ/8wjoOmvtDaavm+34M41mqspoTivJkgH9umS zbMfhPUCeIICq2HX2EGsTiVG8XxCIUe94YHP4yw0B20jvE6yJdp+B5k4atAD+x2sMAgT 6h7Q== X-Gm-Message-State: AOAM531AQi2/VOsinsCI3ZA6MYXxsGVLBloD2JSinsqHQ+fzBPP/uVDE 0SuMjbjChCii+XjK3edqyq56fg== X-Google-Smtp-Source: ABdhPJxICUnLRG0nvrOXdZ6/wSXVNOhOfm78YfD4wbs1ot6wFZ3tdGT4ptiiuIyXDR+7N6c6EtBkFQ== X-Received: by 2002:a37:8cf:: with SMTP id 198mr1815145qki.105.1610542688985; Wed, 13 Jan 2021 04:58:08 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id n36sm868682qte.71.2021.01.13.04.58.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Jan 2021 04:58:08 -0800 (PST) Subject: Re: [PATCH] x86: Set header.feature_1 in TCB for always-on CET To: "H.J. Lu" , GNU C Library , Adhemerval Zanella References: <20210113120910.1258769-1-hjl.tools@gmail.com> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Wed, 13 Jan 2021 09:58:06 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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-List-Received-Date: Wed, 13 Jan 2021 12:58:14 -0000 On 13/01/2021 09:14, H.J. Lu wrote: > On Wed, Jan 13, 2021 at 4:09 AM H.J. Lu wrote: >> >> Update dl_cet_check() to set header.feature_1 in TCB when both IBT and >> SHSTK are always on. >> --- >> sysdeps/x86/Makefile | 6 ++++++ >> sysdeps/x86/dl-cet.c | 5 ++++- >> sysdeps/x86/tst-setjmp-cet.c | 1 + >> 3 files changed, 11 insertions(+), 1 deletion(-) >> create mode 100644 sysdeps/x86/tst-setjmp-cet.c >> >> diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile >> index c814d5a195..adaa2a92cd 100644 >> --- a/sysdeps/x86/Makefile >> +++ b/sysdeps/x86/Makefile >> @@ -48,6 +48,12 @@ endif # $(subdir) == math >> ifeq ($(subdir),setjmp) >> gen-as-const-headers += jmp_buf-ssp.sym >> sysdep_routines += __longjmp_cancel >> +ifneq ($(enable-cet),no) >> +ifneq ($(have-tunables),no) >> +tests += tst-setjmp-cet >> +tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on >> +endif >> +endif >> endif >> >> ifeq ($(subdir),string) >> diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86/dl-cet.c >> index ed7fd6d10d..a63b9c7164 100644 >> --- a/sysdeps/x86/dl-cet.c >> +++ b/sysdeps/x86/dl-cet.c >> @@ -47,7 +47,10 @@ dl_cet_check (struct link_map *m, const char *program) >> /* No legacy object check if both IBT and SHSTK are always on. */ >> if (enable_ibt_type == cet_always_on >> && enable_shstk_type == cet_always_on) >> - return; >> + { >> + THREAD_SETMEM (THREAD_SELF, header.feature_1, GL(dl_x86_feature_1)); >> + return; >> + } >> >> /* Check if IBT is enabled by kernel. */ >> bool ibt_enabled >> diff --git a/sysdeps/x86/tst-setjmp-cet.c b/sysdeps/x86/tst-setjmp-cet.c >> new file mode 100644 >> index 0000000000..42c795d2a8 >> --- /dev/null >> +++ b/sysdeps/x86/tst-setjmp-cet.c >> @@ -0,0 +1 @@ >> +#include >> -- >> 2.29.2 >> > > This fixed: > > https://sourceware.org/bugzilla/show_bug.cgi?id=27177 > > I'd like to fix it for 2.33. > > Thanks. > Ok for 2.33.