Skip to contentSkip to conversation

x86/shstk: shadow stack enabling write return code change

PATCH Superseded Bill Roberts 2 participants 2 messages Jun 15 – Jul 7 x86

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/shstk: shadow stack enabling write return code change

When enabling write to a shadow stack that is not enabled, it will return EPERM. However, that error code doesn't fit the condition and it should be EINVAL, as that state change cannot be fulfilled due to an invalid argument not a permissions issue.

Investigating userspace call sites, they do not rely on this specific error message, nor could userspace effectively utilize this specific return error code to indicate a difference in "I cannot enable write because of invalid permissions" versus "I cannot enable write because the shadow stack is disabled".

---
 arch/x86/kernel/shstk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/shstk.c +1 -1
index 0ca64900192f..eb690ba90180 100644
@@ -490,7 +490,7 @@ static int wrss_control(bool enable)
 	 * when disabling.
 	 */
 	if (!features_enabled(ARCH_SHSTK_SHSTK))
-		return -EPERM;
+		return -EINVAL;
 
 	/* Already enabled/disabled? */
 	if (features_enabled(ARCH_SHSTK_WRSS) == enable)
Signature · 1 line
2.54.0
#1 lore raw
Quoted 2 lines · Bill Roberts

When enabling write to a shadow stack that is not enabled

This^ part is hard to read. How about:

The WRSS instruction (the special instruction that writes to shadow stacks) cannot be used in userspace unless IA32_U_CET.SH_STK_EN=1 (user shadow stack is enabled). So the kernel returns -EINVAL to userspace if it tries to enable it when shadow stack is disabled. However...

Quoted 7 lines

, it will
return EPERM. However, that error code doesn't fit the condition and it should be EINVAL, as that state change cannot be fulfilled due to an invalid argument not a permissions issue.

Investigating userspace call sites,

I'm guessing this is glibc and the selftests? Can you be specific? The tense change is a bit weird too. Maybe something like:

Userspace calls sites in foo, bar, ... do not rely on...

Quoted 24 lines

they do not rely on this specific
error message, nor could userspace effectively utilize this specific return error code to indicate a difference in "I cannot enable write because of invalid permissions" versus "I cannot enable write because the shadow stack is disabled".

---
 arch/x86/kernel/shstk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/shstk.c +1 -1
index 0ca64900192f..eb690ba90180 100644
@@ -490,7 +490,7 @@ static int wrss_control(bool enable)
 	 * when disabling.
 	 */
 	if (!features_enabled(ARCH_SHSTK_SHSTK))
-		return -EPERM;
+		return -EINVAL;
 
 	/* Already enabled/disabled? */
 	if (features_enabled(ARCH_SHSTK_WRSS) == enable)