Skip to content

Commit

Permalink
ptrace: don't modify flags on PTRACE_SETOPTIONS failure
Browse files Browse the repository at this point in the history
On ptrace(PTRACE_SETOPTIONS, pid, 0, <opts>), we used to set those
option bits which are known, and then fail with -EINVAL if there are
some unknown bits in <opts>.

This is inconsistent with typical error handling, which does not change
any state if input is invalid.

This patch changes PTRACE_SETOPTIONS behavior so that in this case, we
return -EINVAL and don't change any bits in task->ptrace.

It's very unlikely that there is userspace code in the wild which will
be affected by this change: it should have the form

    ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_BOGUSOPT)

where PTRACE_O_BOGUSOPT is a constant unknown to the kernel.  But kernel
headers, naturally, don't contain any PTRACE_O_BOGUSOPTs, thus the only
way userspace can use one if it defines one itself.  I can't see why
anyone would do such a thing deliberately.

Signed-off-by: Denys Vlasenko <[email protected]>
Acked-by: Tejun Heo <[email protected]>
Reviewed-by: Oleg Nesterov <[email protected]>
Cc: Pedro Alves <[email protected]>
Cc: Jan Kratochvil <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Denys Vlasenko authored and torvalds committed Mar 23, 2012
1 parent b1845ff commit 8c5cf9e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,9 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds

static int ptrace_setoptions(struct task_struct *child, unsigned long data)
{
if (data & ~(unsigned long)PTRACE_O_MASK)
return -EINVAL;

child->ptrace &= ~PT_TRACE_MASK;

if (data & PTRACE_O_TRACESYSGOOD)
Expand All @@ -551,7 +554,7 @@ static int ptrace_setoptions(struct task_struct *child, unsigned long data)
if (data & PTRACE_O_TRACEEXIT)
child->ptrace |= PT_TRACE_EXIT;

return (data & ~PTRACE_O_MASK) ? -EINVAL : 0;
return 0;
}

static int ptrace_getsiginfo(struct task_struct *child, siginfo_t *info)
Expand Down

0 comments on commit 8c5cf9e

Please sign in to comment.