From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6784 invoked by alias); 5 Oct 2018 13:10:20 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 6685 invoked by uid 89); 5 Oct 2018 13:10:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=resolver X-Spam-Status: No, score=-25.1 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: mail-ot1-f68.google.com Received: from mail-ot1-f68.google.com (HELO mail-ot1-f68.google.com) (209.85.210.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 05 Oct 2018 13:10:17 +0000 Received: by mail-ot1-f68.google.com with SMTP id q50so8478796otd.0 for ; Fri, 05 Oct 2018 06:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=g7rH6fP5cLq+mYZF6EWGivHToPiaKIBCCrLiS2h8NBA=; b=MCAvfgJMuMbdb6brx+sOkh3HOYQVvtwBGCdhwogJF1b4tnnhxpI39dPq1AOBWR+rPf /9l+KJ0Vq4W0ZdJYj+Ertqj/2ZPfhxRJ2zlZQdjQFiPu+b+VApfbim1fT24nK8c30DPj J8K9pe6y2ir4OOzC5R7uola/eLHAjT5+iITbFvu+NM9brJfjWJ2Qd6MyWFo9/7VQ021G rYNc3QdU9JcCEWsK8ssLn2ngt5DdCQMQCq5TektBQb8xqWwznqn/sENsvaL4Qf3UuwEz /z7vHx30UA4dHsx9RCCmbDRlipv73pKQ8v58fV+SRpAuldk5uWmw6M5Es8313r5bPbRV fwuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=g7rH6fP5cLq+mYZF6EWGivHToPiaKIBCCrLiS2h8NBA=; b=NEb6/RrKAImwWvndt9QLPumJ3N3js8YBX3zXLn/J9bWF2ECDV+yG1CNmd6kweF9Apc 0CkJbImgT0jBG6Rhiu+r9gdTY7qUepoMw3n+AMpNU1xpIj89+qn28yFTC5p2KoSuS+Ns TB5IJpZQueKH0glbWSXpbLKB0Vh9NweQMWtXZPTwNjlgCFcyPCQEBtB1vrR0moviHNKR UiHfqwOZ9AYyT+P+rTMuhBsHlI8D4kpZC/LqjfcpkAzeBuSl8unKKPMY4Ek5b/j5hJef peNCXKPY66R6/rjTfPll6YaXQoaIH36JnvrzideuWQG54m3zvkt3qYCP1PhDxLPcvS0N t25A== X-Gm-Message-State: ABuFfojuGoFNQODS4Q2HmH/WPyPB9GGR5LGtMh8Vcv6gRrydJ0jZP5ue zwei3i3WZhn50JYb8ZS2DEZhGC2hyqyC/kMWoP5HlQ== X-Google-Smtp-Source: ACcGV63g7kkGIo21Q2gsXGZTnNT2kSSEzw6BY0rQL5TLp1CH1P3kZz9VdgXOhnF5TZBEV0PZyUalocyn176tfoiIAkA= X-Received: by 2002:a9d:2132:: with SMTP id i47mr3705652otb.104.1538745015697; Fri, 05 Oct 2018 06:10:15 -0700 (PDT) MIME-Version: 1.0 References: <20180926171711.29435-1-hjl.tools@gmail.com> <87a7o45g1d.fsf@oldenburg.str.redhat.com> In-Reply-To: From: "H.J. Lu" Date: Mon, 01 Jan 2018 00:00:00 -0000 Message-ID: Subject: Fwd: [PATCH] i386: Use _dl_runtime_[resolve|profile]_shstk for SHSTK [BZ #23716] To: Libc-stable Mailing List Content-Type: multipart/mixed; boundary="0000000000000fa7c905777afe6f" X-IsSubscribed: yes X-SW-Source: 2018-10/txt/msg00000.txt.bz2 --0000000000000fa7c905777afe6f Content-Type: text/plain; charset="UTF-8" Content-length: 1432 I will backport this to glibc 2.28 branch next week. H.J. ---------- Forwarded message --------- From: H.J. Lu Date: Fri, Sep 28, 2018 at 1:25 PM Subject: Re: [PATCH] i386: Use _dl_runtime_[resolve|profile]_shstk for SHSTK [BZ #23716] To: Florian Weimer Cc: GNU C Library On Fri, Sep 28, 2018 at 7:33 AM, H.J. Lu wrote: > On Wed, Sep 26, 2018 at 10:30 AM, H.J. Lu wrote: >> On Wed, Sep 26, 2018 at 10:23 AM, Florian Weimer wrote: >>> * H. J. Lu: >>> >>>> diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S >>>> index 6dc0319216..9734f9c981 100644 >>>> --- a/sysdeps/i386/dl-trampoline.S >>>> +++ b/sysdeps/i386/dl-trampoline.S >>>> @@ -33,6 +33,7 @@ >>>> _dl_runtime_resolve: >>>> cfi_adjust_cfa_offset (8) >>>> _CET_ENDBR >>>> + hlt >>>> pushl %eax # Preserve registers otherwise clobbered. >>>> cfi_adjust_cfa_offset (4) >>>> pushl %ecx >>> >>> That doesn't look right. 8-) >>> >> >> This is the change I used to test my fix to verify that the SHSTK resolver >> is used if SHSTK is enabled by kernel. It isn't the part of the fix. >> > > We verified that the fix worked on CET simulator. If there is no objection, > I will check it later today. > > Thanks. This is the patch I am checking in now. -- H.J. -- H.J. --0000000000000fa7c905777afe6f Content-Type: application/x-patch; name="0001-i386-Use-_dl_runtime_-resolve-profile-_shstk-for-SHS.patch" Content-Disposition: attachment; filename="0001-i386-Use-_dl_runtime_-resolve-profile-_shstk-for-SHS.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jmmgi8xz0 Content-length: 7129 RnJvbSA5OTIyNmNlYjY3YThkMmFmYmNmMjkxYjVkYTM0OWVlNzQzMmYxMGRi IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhq bC50b29sc0BnbWFpbC5jb20+CkRhdGU6IFdlZCwgMjYgU2VwIDIwMTggMTA6 MDk6MDUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBpMzg2OiBVc2UgX2RsX3J1 bnRpbWVfW3Jlc29sdmV8cHJvZmlsZV1fc2hzdGsgZm9yIFNIU1RLIFtCWgog IzIzNzE2XQoKV2hlbiBlbGZfbWFjaGluZV9ydW50aW1lX3NldHVwIGlzIGNh bGxlZCB0byBzZXQgdXAgcmVzb2x2ZXIsIGl0IHNob3VsZAp1c2UgX2RsX3J1 bnRpbWVfcmVzb2x2ZV9zaHN0ayBvciBfZGxfcnVudGltZV9wcm9maWxlX3No c3RrIGlmIFNIU1RLIGlzCmVuYWJsZWQgYnkga2VybmVsLgoKVGVzdGVkIG9u IGk2ODYgd2l0aCBhbmQgd2l0aG91dCAtLWVuYWJsZS1jZXQgYXMgd2VsbCBh cyBvbiBDRVQgZW11bGF0b3IKd2l0aCAtLWVuYWJsZS1jZXQuCgoJW0JaICMy MzcxNl0KCSogc3lzZGVwcy9pMzg2L2RsLWNldC5jOiBSZW1vdmVkLgoJKiBz eXNkZXBzL2kzODYvZGwtbWFjaGluZS5oIChfZGxfcnVudGltZV9yZXNvbHZl X3Noc3RrKTogTmV3Cglwcm90b3R5cGUuCgkoX2RsX3J1bnRpbWVfcHJvZmls ZV9zaHN0ayk6IExpa2V3aXNlLgoJKGVsZl9tYWNoaW5lX3J1bnRpbWVfc2V0 dXApOiBVc2UgX2RsX3J1bnRpbWVfcHJvZmlsZV9zaHN0ayBvcgoJX2RsX3J1 bnRpbWVfcmVzb2x2ZV9zaHN0ayBpZiBTSFNUSyBpcyBlbmFibGVkIGJ5IGtl cm5lbC4KClNpZ25lZC1vZmYtYnk6IEguSi4gTHUgPGhqbC50b29sc0BnbWFp bC5jb20+Ci0tLQogc3lzZGVwcy9pMzg2L2RsLWNldC5jICAgICB8IDY3IC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogc3lzZGVw cy9pMzg2L2RsLW1hY2hpbmUuaCB8IDEzICsrKysrKy0tCiAyIGZpbGVzIGNo YW5nZWQsIDExIGluc2VydGlvbnMoKyksIDY5IGRlbGV0aW9ucygtKQogZGVs ZXRlIG1vZGUgMTAwNjQ0IHN5c2RlcHMvaTM4Ni9kbC1jZXQuYwoKZGlmZiAt LWdpdCBhL3N5c2RlcHMvaTM4Ni9kbC1jZXQuYyBiL3N5c2RlcHMvaTM4Ni9k bC1jZXQuYwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNWQ5YTRl OGQ1MS4uMDAwMDAwMDAwMAotLS0gYS9zeXNkZXBzL2kzODYvZGwtY2V0LmMK KysrIC9kZXYvbnVsbApAQCAtMSw2NyArMCwwIEBACi0vKiBMaW51eC9pMzg2 IENFVCBpbml0aWFsaXplcnMgZnVuY3Rpb24uCi0gICBDb3B5cmlnaHQgKEMp IDIwMTggRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCi0KLSAgIFRo ZSBHTlUgQyBMaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVk aXN0cmlidXRlIGl0IGFuZC9vcgotICAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0 ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwotICAgTGlj ZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRh dGlvbjsgZWl0aGVyCi0gICB2ZXJzaW9uIDIuMSBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KLQotICAg VGhlIEdOVSBDIExpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUg dGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKLSAgIGJ1dCBXSVRIT1VUIEFOWSBX QVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9m Ci0gICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQotICAgTGVzc2VyIEdlbmVyYWwg UHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KLQotICAgWW91IHNo b3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExlc3NlciBH ZW5lcmFsIFB1YmxpYwotICAgTGljZW5zZSBhbG9uZyB3aXRoIHRoZSBHTlUg QyBMaWJyYXJ5OyBpZiBub3QsIHNlZQotICAgPGh0dHA6Ly93d3cuZ251Lm9y Zy9saWNlbnNlcy8+LiAgKi8KLQotCi0jZGVmaW5lIExJTktBR0Ugc3RhdGlj IGlubGluZQotI2RlZmluZSBfZGxfY2V0X2NoZWNrIGNldF9jaGVjawotI2lu Y2x1ZGUgPHN5c2RlcHMveDg2L2RsLWNldC5jPgotI3VuZGVmIF9kbF9jZXRf Y2hlY2sKLQotI2lmZGVmIFNIQVJFRAotdm9pZAotX2RsX2NldF9jaGVjayAo c3RydWN0IGxpbmtfbWFwICptYWluX21hcCwgY29uc3QgY2hhciAqcHJvZ3Jh bSkKLXsKLSAgY2V0X2NoZWNrIChtYWluX21hcCwgcHJvZ3JhbSk7Ci0KLSAg aWYgKChHTChkbF94ODZfZmVhdHVyZV8xKVswXSAmIEdOVV9QUk9QRVJUWV9Y ODZfRkVBVFVSRV8xX1NIU1RLKSkKLSAgICB7Ci0gICAgICAvKiBSZXBsYWNl IF9kbF9ydW50aW1lX3Jlc29sdmUgYW5kIF9kbF9ydW50aW1lX3Byb2ZpbGUg d2l0aAotICAgICAgICAgX2RsX3J1bnRpbWVfcmVzb2x2ZV9zaHN0ayBhbmQg X2RsX3J1bnRpbWVfcHJvZmlsZV9zaHN0aywKLQkgcmVzcGVjdGl2ZWx5IGlm IFNIU1RLIGlzIGVuYWJsZWQuICAqLwotICAgICAgZXh0ZXJuIHZvaWQgX2Rs X3J1bnRpbWVfcmVzb2x2ZSAoRWxmMzJfV29yZCkgYXR0cmlidXRlX2hpZGRl bjsKLSAgICAgIGV4dGVybiB2b2lkIF9kbF9ydW50aW1lX3Jlc29sdmVfc2hz dGsgKEVsZjMyX1dvcmQpIGF0dHJpYnV0ZV9oaWRkZW47Ci0gICAgICBleHRl cm4gdm9pZCBfZGxfcnVudGltZV9wcm9maWxlIChFbGYzMl9Xb3JkKSBhdHRy aWJ1dGVfaGlkZGVuOwotICAgICAgZXh0ZXJuIHZvaWQgX2RsX3J1bnRpbWVf cHJvZmlsZV9zaHN0ayAoRWxmMzJfV29yZCkgYXR0cmlidXRlX2hpZGRlbjsK LSAgICAgIHVuc2lnbmVkIGludCBpOwotICAgICAgc3RydWN0IGxpbmtfbWFw ICpsOwotICAgICAgRWxmMzJfQWRkciAqZ290OwotCi0gICAgICBpZiAobWFp bl9tYXAtPmxfaW5mb1tEVF9KTVBSRUxdKQotCXsKLQkgIGdvdCA9IChFbGYz Ml9BZGRyICopIERfUFRSIChtYWluX21hcCwgbF9pbmZvW0RUX1BMVEdPVF0p OwotCSAgaWYgKGdvdFsyXSA9PSAoRWxmMzJfQWRkcikgJl9kbF9ydW50aW1l X3Jlc29sdmUpCi0JICAgIGdvdFsyXSA9IChFbGYzMl9BZGRyKSAmX2RsX3J1 bnRpbWVfcmVzb2x2ZV9zaHN0azsKLQkgIGVsc2UgaWYgKGdvdFsyXSA9PSAo RWxmMzJfQWRkcikgJl9kbF9ydW50aW1lX3Byb2ZpbGUpCi0JICAgIGdvdFsy XSA9IChFbGYzMl9BZGRyKSAmX2RsX3J1bnRpbWVfcHJvZmlsZV9zaHN0azsK LQl9Ci0KLSAgICAgIGkgPSBtYWluX21hcC0+bF9zZWFyY2hsaXN0LnJfbmxp c3Q7Ci0gICAgICB3aGlsZSAoaS0tID4gMCkKLQl7Ci0JICBsID0gbWFpbl9t YXAtPmxfaW5pdGZpbmlbaV07Ci0JICBpZiAobC0+bF9pbmZvW0RUX0pNUFJF TF0pCi0JICAgIHsKLQkgICAgICBnb3QgPSAoRWxmMzJfQWRkciAqKSBEX1BU UiAobCwgbF9pbmZvW0RUX1BMVEdPVF0pOwotCSAgICAgIGlmIChnb3RbMl0g PT0gKEVsZjMyX0FkZHIpICZfZGxfcnVudGltZV9yZXNvbHZlKQotCQlnb3Rb Ml0gPSAoRWxmMzJfQWRkcikgJl9kbF9ydW50aW1lX3Jlc29sdmVfc2hzdGs7 Ci0JICAgICAgZWxzZSBpZiAoZ290WzJdID09IChFbGYzMl9BZGRyKSAmX2Rs X3J1bnRpbWVfcHJvZmlsZSkKLQkJZ290WzJdID0gKEVsZjMyX0FkZHIpICZf ZGxfcnVudGltZV9wcm9maWxlX3Noc3RrOwotCSAgICB9Ci0JfQotICAgIH0K LX0KLSNlbmRpZgpkaWZmIC0tZ2l0IGEvc3lzZGVwcy9pMzg2L2RsLW1hY2hp bmUuaCBiL3N5c2RlcHMvaTM4Ni9kbC1tYWNoaW5lLmgKaW5kZXggMWFmZGNi ZDllYS4uZjZjZmI5MGUyMSAxMDA2NDQKLS0tIGEvc3lzZGVwcy9pMzg2L2Rs LW1hY2hpbmUuaAorKysgYi9zeXNkZXBzL2kzODYvZGwtbWFjaGluZS5oCkBA IC02Nyw2ICs2NywxMSBAQCBlbGZfbWFjaGluZV9ydW50aW1lX3NldHVwIChz dHJ1Y3QgbGlua19tYXAgKmwsIGludCBsYXp5LCBpbnQgcHJvZmlsZSkKICAg RWxmMzJfQWRkciAqZ290OwogICBleHRlcm4gdm9pZCBfZGxfcnVudGltZV9y ZXNvbHZlIChFbGYzMl9Xb3JkKSBhdHRyaWJ1dGVfaGlkZGVuOwogICBleHRl cm4gdm9pZCBfZGxfcnVudGltZV9wcm9maWxlIChFbGYzMl9Xb3JkKSBhdHRy aWJ1dGVfaGlkZGVuOworICBleHRlcm4gdm9pZCBfZGxfcnVudGltZV9yZXNv bHZlX3Noc3RrIChFbGYzMl9Xb3JkKSBhdHRyaWJ1dGVfaGlkZGVuOworICBl eHRlcm4gdm9pZCBfZGxfcnVudGltZV9wcm9maWxlX3Noc3RrIChFbGYzMl9X b3JkKSBhdHRyaWJ1dGVfaGlkZGVuOworICAvKiBDaGVjayBpZiBTSFNUSyBp cyBlbmFibGVkIGJ5IGtlcm5lbC4gICovCisgIGJvb2wgc2hzdGtfZW5hYmxl ZAorICAgID0gKEdMKGRsX3g4Nl9mZWF0dXJlXzEpWzBdICYgR05VX1BST1BF UlRZX1g4Nl9GRUFUVVJFXzFfU0hTVEspICE9IDA7CiAKICAgaWYgKGwtPmxf aW5mb1tEVF9KTVBSRUxdICYmIGxhenkpCiAgICAgewpAQCAtOTMsNyArOTgs OSBAQCBlbGZfbWFjaGluZV9ydW50aW1lX3NldHVwIChzdHJ1Y3QgbGlua19t YXAgKmwsIGludCBsYXp5LCBpbnQgcHJvZmlsZSkKIAkgZW5kIGluIHRoaXMg ZnVuY3Rpb24uICAqLwogICAgICAgaWYgKF9fZ2xpYmNfdW5saWtlbHkgKHBy b2ZpbGUpKQogCXsKLQkgIGdvdFsyXSA9IChFbGYzMl9BZGRyKSAmX2RsX3J1 bnRpbWVfcHJvZmlsZTsKKwkgIGdvdFsyXSA9IChzaHN0a19lbmFibGVkCisJ CSAgICA/IChFbGYzMl9BZGRyKSAmX2RsX3J1bnRpbWVfcHJvZmlsZV9zaHN0 aworCQkgICAgOiAoRWxmMzJfQWRkcikgJl9kbF9ydW50aW1lX3Byb2ZpbGUp OwogCiAJICBpZiAoR0xSTyhkbF9wcm9maWxlKSAhPSBOVUxMCiAJICAgICAg JiYgX2RsX25hbWVfbWF0Y2hfcCAoR0xSTyhkbF9wcm9maWxlKSwgbCkpCkBA IC0xMDQsNyArMTExLDkgQEAgZWxmX21hY2hpbmVfcnVudGltZV9zZXR1cCAo c3RydWN0IGxpbmtfbWFwICpsLCBpbnQgbGF6eSwgaW50IHByb2ZpbGUpCiAg ICAgICBlbHNlCiAJLyogVGhpcyBmdW5jdGlvbiB3aWxsIGdldCBjYWxsZWQg dG8gZml4IHVwIHRoZSBHT1QgZW50cnkgaW5kaWNhdGVkIGJ5CiAJICAgdGhl IG9mZnNldCBvbiB0aGUgc3RhY2ssIGFuZCB0aGVuIGp1bXAgdG8gdGhlIHJl c29sdmVkIGFkZHJlc3MuICAqLwotCWdvdFsyXSA9IChFbGYzMl9BZGRyKSAm X2RsX3J1bnRpbWVfcmVzb2x2ZTsKKwlnb3RbMl0gPSAoc2hzdGtfZW5hYmxl ZAorCQkgID8gKEVsZjMyX0FkZHIpICZfZGxfcnVudGltZV9yZXNvbHZlX3No c3RrCisJCSAgOiAoRWxmMzJfQWRkcikgJl9kbF9ydW50aW1lX3Jlc29sdmUp OwogICAgIH0KIAogICByZXR1cm4gbGF6eTsKLS0gCjIuMTcuMQoK --0000000000000fa7c905777afe6f--