mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86-64/cet: Move dl-cet.[ch] to x86_64 directories

Browse Source 
Since CET is only enabled for x86-64, move dl-cet.[ch] to x86_64
directories.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
H.J. Lu 2024-01-09 12:23:25 -08:00
parent b45115a666
commit a1bbee9fd1
3 changed files with 47 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
sysdeps/unix/sysv/linux/x86/dl-cet.h
View File

@ -1,63 +0,0 @@
/* Linux/x86 CET initializers function.
Copyright (C) 2018-2024 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/prctl.h>
#include <asm/prctl.h>
static __always_inline int
dl_cet_disable_cet (unsigned int cet_feature)
{
if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK)
return -1;
long long int kernel_feature = ARCH_SHSTK_SHSTK;
return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_DISABLE,
kernel_feature);
}
static __always_inline int
dl_cet_lock_cet (unsigned int cet_feature)
{
if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK)
return -1;
/* Lock all SHSTK features. */
long long int kernel_feature = -1;
return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_LOCK,
kernel_feature);
}
static __always_inline unsigned int
dl_cet_get_cet_status (void)
{
unsigned long long kernel_feature;
unsigned int status = 0;
if (INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_STATUS,
&kernel_feature) == 0)
{
if ((kernel_feature & ARCH_SHSTK_SHSTK) != 0)
status = GNU_PROPERTY_X86_FEATURE_1_SHSTK;
}
return status;
}
/* Enable shadow stack with a macro to avoid shadow stack underflow. */
#define ENABLE_X86_CET(cet_feature) \
if ((cet_feature & GNU_PROPERTY_X86_FEATURE_1_SHSTK)) \
{ \
long long int kernel_feature = ARCH_SHSTK_SHSTK; \
INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_ENABLE, \
kernel_feature); \
}

47
sysdeps/unix/sysv/linux/x86_64/dl-cet.h
View File

@ -15,8 +15,53 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/prctl.h>
#include <asm/prctl.h>
#include <cpu-features-offsets.h>
#include_next <dl-cet.h>
static __always_inline int
dl_cet_disable_cet (unsigned int cet_feature)
{
if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK)
return -1;
long long int kernel_feature = ARCH_SHSTK_SHSTK;
return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_DISABLE,
kernel_feature);
}
static __always_inline int
dl_cet_lock_cet (unsigned int cet_feature)
{
if (cet_feature != GNU_PROPERTY_X86_FEATURE_1_SHSTK)
return -1;
/* Lock all SHSTK features. */
long long int kernel_feature = -1;
return (int) INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_LOCK,
kernel_feature);
}
static __always_inline unsigned int
dl_cet_get_cet_status (void)
{
unsigned long long kernel_feature;
unsigned int status = 0;
if (INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_STATUS,
&kernel_feature) == 0)
{
if ((kernel_feature & ARCH_SHSTK_SHSTK) != 0)
status = GNU_PROPERTY_X86_FEATURE_1_SHSTK;
}
return status;
}
/* Enable shadow stack with a macro to avoid shadow stack underflow. */
#define ENABLE_X86_CET(cet_feature) \
if ((cet_feature & GNU_PROPERTY_X86_FEATURE_1_SHSTK)) \
{ \
long long int kernel_feature = ARCH_SHSTK_SHSTK; \
INTERNAL_SYSCALL_CALL (arch_prctl, ARCH_SHSTK_ENABLE, \
kernel_feature); \
}
#define X86_STRINGIFY_1(x) #x
#define X86_STRINGIFY(x) X86_STRINGIFY_1 (x)

2
sysdeps/x86/dl-cet.c → sysdeps/x86_64/dl-cet.c
View File

@ -1,4 +1,4 @@
/* x86 CET initializers function.
/* x86-64 CET initializers function.
Copyright (C) 2018-2024 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or