Skip to content
This repository was archived by the owner on Apr 9, 2025. It is now read-only.

Add some kernel log to detect which branch would go to badframe #112

Open
wangtao-intel wants to merge 1 commit into
base: celadon/s/mr0/apollo
Choose a base branch
from
Open

Add some kernel log to detect which branch would go to badframe #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions arch/x86/kernel/fpu/signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,14 @@ static inline int check_xstate_in_sigframe(struct fxregs_state __user *fxbuf,
* fpstate layout with out copying the extended state information
* in the memory layout.
*/
if (__get_user(magic2, (__u32 __user *)(fpstate + fx_sw->xstate_size)))
return -EFAULT;
__u32 __user *val = (__u32 __user *)(fpstate + fx_sw->xstate_size);

pr_info("IBT.check_xstate_in_sigframe (fpstate + fx_sw->xstate_size): %u\n", *val);

if (__get_user(magic2, (__u32 __user *)(fpstate + fx_sw->xstate_size))){
pr_info("IBT.check_xstate_in_sigframe __get_user.magic2 %d\n", magic2);
return -EFAULT;
}

if (likely(magic2 == FP_XSTATE_MAGIC2))
return 0;
Expand Down Expand Up @@ -332,6 +338,7 @@ static int __fpu_restore_sig(void __user *buf, void __user *buf_fx,
* faults. If it does, fall back to the slow path below, going
* through the kernel buffer with the enabled pagefault handler.
*/
pr_info("IBT.__fpu_restore_sig restore_fpregs_from_user\n");
return restore_fpregs_from_user(buf_fx, user_xfeatures, fx_only,
state_size);
}
Expand Down Expand Up @@ -466,6 +473,7 @@ int fpu__restore_sig(void __user *buf, int ia32_frame)
NULL, buf);
} else {
ret = __fpu_restore_sig(buf, buf_fx, ia32_fxstate);
pr_info("IBT.fpu__restore_sig s: %d\n", ret);
}

out:
Expand Down
33 changes: 26 additions & 7 deletions arch/x86/kernel/signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,17 @@ static int restore_sigcontext(struct pt_regs *regs,
unsigned long uc_flags)
{
struct sigcontext sc;

bool cret;
/* Always make any pending restarted system calls return -EINTR */
current->restart_block.fn = do_no_restart_syscall;

pr_info("IBT.restore_sigcontext usc: %px & size: %d\n",usc, CONTEXT_COPY_SIZE);

if (copy_from_user(&sc, usc, CONTEXT_COPY_SIZE))
return -EFAULT;
if (copy_from_user(&sc, usc, CONTEXT_COPY_SIZE)){
pr_info("IBT.restore_sigcontext sc: %px \n",&sc);
return -EFAULT;

}

#ifdef CONFIG_X86_32
set_user_gs(regs, sc.gs);
Expand Down Expand Up @@ -136,8 +141,16 @@ static int restore_sigcontext(struct pt_regs *regs,
force_valid_ss(regs);
#endif

return fpu__restore_sig((void __user *)sc.fpstate,
IS_ENABLED(CONFIG_X86_32));
//return fpu__restore_sig((void __user *)sc.fpstate,
// IS_ENABLED(CONFIG_X86_32));
pr_info("IBT.restore_sigcontext sc.fpstate: %lx\n", (void __user *)sc.fpstate);

cret = fpu__restore_sig((void __user *)sc.fpstate,
IS_ENABLED(CONFIG_X86_32));

pr_info("IBT.restore_sigcontext cret %d\n", cret);

return cret;
}

static __always_inline int
Expand Down Expand Up @@ -662,6 +675,11 @@ SYSCALL_DEFINE0(rt_sigreturn)
unsigned long uc_flags;

frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long));

pr_info("IBT.rt_sigreturn: fpstate %lx\n", frame->uc.uc_mcontext.fpstate);
pr_info("IBT.rt_sigreturn: regs IP: %lx, SP: %lx, BP: %lx\n", regs->ip, regs->sp, regs->bp);
pr_info("IBT.rt_sigreturn: frame: %px\n", frame);

if (!access_ok(frame, sizeof(*frame)))
goto badframe;
if (__get_user(*(__u64 *)&set, (__u64 __user *)&frame->uc.uc_sigmask))
Expand All @@ -671,9 +689,10 @@ SYSCALL_DEFINE0(rt_sigreturn)

set_current_blocked(&set);

if (restore_sigcontext(regs, &frame->uc.uc_mcontext, uc_flags))
if (restore_sigcontext(regs, &frame->uc.uc_mcontext, uc_flags)){
pr_info("IBT.rt_sigreturn: !restore_sigcontext uc_flags %lu\n", (unsigned long)uc_flags);
goto badframe;

}
if (restore_altstack(&frame->uc.uc_stack))
goto badframe;

Expand Down