Skip to content

Commit

Permalink
x86/shstk: Add warning for shadow stack double unmap
Browse files Browse the repository at this point in the history
There are several ways a thread's shadow stacks can get unmapped. This
can happen on exit or exec, as well as error handling in exec or clone.
The task struct already keeps track of the thread's shadow stack. Use the
size variable to keep track of if the shadow stack has already been freed.

When an attempt to double unmap the thread shadow stack is caught, warn
about it and abort the operation.

Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Tested-by: H.J. Lu <hjl.tools@gmail.com>
Link: https://lore.kernel.org/all/20230908203655.543765-4-rick.p.edgecombe%40intel.com
  • Loading branch information
Rick Edgecombe authored and Dave Hansen committed Sep 19, 2023
1 parent 748c90c commit 509ff51
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions arch/x86/kernel/shstk.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,18 @@ void shstk_free(struct task_struct *tsk)
if (!shstk->base)
return;

/*
* shstk->base is NULL for CLONE_VFORK child tasks, and so is
* normal. But size = 0 on a shstk->base is not normal and
* indicated an attempt to free the thread shadow stack twice.
* Warn about it.
*/
if (WARN_ON(!shstk->size))
return;

unmap_shadow_stack(shstk->base, shstk->size);

shstk->size = 0;
}

static int wrss_control(bool enable)
Expand Down

0 comments on commit 509ff51

Please sign in to comment.