From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 460C33853D08; Tue, 20 Jun 2023 08:09:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 460C33853D08 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1687248548; bh=wDr5dUCVjsjfInqz2Hm0maDOhPGDjYQsMR2wq5CRB3Q=; h=From:To:Subject:Date:From; b=ALktuJKmdFke9IipJli2SAzYXWPcic7UqCW9QhuJ6bXNL1tQywP1MkBog/KET8M4P 5J1BZkq2VTi3fpkQp+FYveQRKD1f3Oq5/ig8+/Qz+33w4J3TMpNgR8zjy8Sa5RXznE lmeJ352QIGVSLXV0U9jlMnFmkvI4rmExyFet8vB8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] fhandler/proc.cc: use wincap.has_user_shstk X-Act-Checkin: newlib-cygwin X-Git-Author: Brian Inglis X-Git-Refname: refs/heads/main X-Git-Oldrev: 1c4a00962fb78f722d3faafe2f71506e6124cacb X-Git-Newrev: 6604db8b80bd8c5aed4673ade49f768b9f51898b Message-Id: <20230620080908.460C33853D08@sourceware.org> Date: Tue, 20 Jun 2023 08:09:08 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D6604db8b80b= d8c5aed4673ade49f768b9f51898b commit 6604db8b80bd8c5aed4673ade49f768b9f51898b Author: Brian Inglis AuthorDate: Mon Jun 19 12:15:19 2023 -0600 Commit: Corinna Vinschen CommitDate: Tue Jun 20 10:06:56 2023 +0200 fhandler/proc.cc: use wincap.has_user_shstk =20 In test for AMD/Intel Control flow Enforcement Technology user mode shadow stack support replace Windows version tests with test of wincap member addition has_user_shstk with Windows version dependent value =20 Fixes: 41fdb869f998 ("fhandler/proc.cc(format_proc_cpuinfo): Add Linux = 6.3 cpuinfo") Signed-off-by: Brian Inglis Diff: --- winsup/cygwin/fhandler/proc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc index 3c79762e0fbd..cbc49a12a417 100644 --- a/winsup/cygwin/fhandler/proc.cc +++ b/winsup/cygwin/fhandler/proc.cc @@ -1486,12 +1486,12 @@ format_proc_cpuinfo (void *, char *&destbuf) =20 /* ftcprint (features1, 6, "split_lock_detect");*//* MSR_TEST_CTRL spli= t lock */ =20 - /* cpuid 0x00000007 ecx & Windows [20]20H1/[20]2004+ */ - if (maxf >=3D 0x00000007 && wincap.osname () >=3D "10.0" - && wincap.build_number () >=3D 19041) + /* Windows [20]20H1/[20]2004/19041 user shadow stack */ + if (maxf >=3D 0x00000007 && wincap.has_user_shstk ()) { + /* cpuid 0x00000007 ecx CET shadow stack */ cpuid (&unused, &unused, &features1, &unused, 0x00000007, 0); - ftcprint (features1, 7, "user_shstk"); /* "user shadow stack" */ + ftcprint (features1, 7, "user_shstk"); /* user shadow stack */ } =20 /* cpuid 0x00000007:1 eax */