On Fri, 2021-05-21 at 15:15 -0700, Yu-cheng Yu wrote: > From: "H.J. Lu" <hjl.tools@xxxxxxxxx> > > Update ARCH_X86_CET_STATUS and ARCH_X86_CET_DISABLE for Indirect > Branch > Tracking. > > Signed-off-by: H.J. Lu <hjl.tools@xxxxxxxxx> > Signed-off-by: Yu-cheng Yu <yu-cheng.yu@xxxxxxxxx> > Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> > --- > arch/x86/kernel/cet_prctl.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/x86/kernel/cet_prctl.c > b/arch/x86/kernel/cet_prctl.c > index b426d200e070..bd3c80d402e7 100644 > --- a/arch/x86/kernel/cet_prctl.c > +++ b/arch/x86/kernel/cet_prctl.c > @@ -22,6 +22,9 @@ static int cet_copy_status_to_user(struct > thread_shstk *shstk, u64 __user *ubuf) > buf[2] = shstk->size; > } > > + if (shstk->ibt) > + buf[0] |= GNU_PROPERTY_X86_FEATURE_1_IBT; > + Can you have IBT enabled but not shadow stack via kernel parameters? Outside this diff it has: if (!cpu_feature_enabled(X86_FEATURE_SHSTK)) return -ENOTSUPP; So if "no_user_shstk" is set, this can't be used for IBT. But the kernel would attempt to enable IBT. Also if so, the CR4 bit enabling logic needs adjusting in this IBT series. If not, we should probably mention this in the docs and enforce it. It would then follow the logic in Kconfig, so maybe the simplest. Like maybe instead of no_user_shstk, just no_user_cet? > return copy_to_user(ubuf, buf, sizeof(buf)); > } > > @@ -46,6 +49,8 @@ int prctl_cet(int option, u64 arg2) > return -EINVAL; > if (arg2 & GNU_PROPERTY_X86_FEATURE_1_SHSTK) > shstk_disable(); > + if (arg2 & GNU_PROPERTY_X86_FEATURE_1_IBT) > + ibt_disable(); > return 0; > > case ARCH_X86_CET_LOCK:
