Skip to content

Commit

Permalink
x86/shstk: Check that SSP is aligned on sigreturn
Browse files Browse the repository at this point in the history
The shadow stack signal frame is read by the kernel on sigreturn. It
relies on shadow stack memory protections to prevent forgeries of this
signal frame (which included the pre-signal SSP). It also relies on the
shadow stack signal frame to have bit 63 set. Since this bit would not be
set via typical shadow stack operations, so the kernel can assume it was a
value it placed there.

However, in order to support 32 bit shadow stack, the INCSSPD instruction
can increment the shadow stack by 4 bytes. In this case SSP might be
pointing to a region spanning two 8 byte shadow stack frames. It could
confuse the checks described above.

Since the kernel only supports shadow stack in 64 bit, just check that
the SSP is 8 byte aligned in the sigreturn path.

Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20230613001108.3040476-33-rick.p.edgecombe%40intel.com
  • Loading branch information
rpedgeco authored and hansendc committed Aug 2, 2023
1 parent 05e3602 commit b93d6c7
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86/kernel/shstk.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ static int shstk_pop_sigframe(unsigned long *ssp)
unsigned long token_addr;
int err;

if (!IS_ALIGNED(*ssp, 8))
return -EINVAL;

err = get_shstk_data(&token_addr, (unsigned long __user *)*ssp);
if (unlikely(err))
return err;
Expand Down

0 comments on commit b93d6c7

Please sign in to comment.