Commit 547ad5ac authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86/orig_ax' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland

* 'x86/orig_ax' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: ptrace: set TS_COMPAT when 32-bit ptrace sets orig_eax>=0
  x86: ptrace: do not sign-extend orig_ax on write
  x86: syscall_get_nr returns int
  asm-generic: syscall_get_nr returns int
parents 4fefce9a 8cb3ed13
/* /*
* Access to user system call parameters and results * Access to user system call parameters and results
* *
* Copyright (C) 2008 Red Hat, Inc. All rights reserved. * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
* *
* This copyrighted material is made available to anyone wishing to use, * This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions * modify, copy, or redistribute it subject to the terms and conditions
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/err.h> #include <linux/err.h>
static inline long syscall_get_nr(struct task_struct *task, /*
struct pt_regs *regs) * Only the low 32 bits of orig_ax are meaningful, so we return int.
{ * This importantly ignores the high bits on 64-bit, so comparisons
/* * sign-extend the low 32 bits.
* We always sign-extend a -1 value being set here,
* so this is always either -1L or a syscall number.
*/ */
static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs)
{
return regs->orig_ax; return regs->orig_ax;
} }
......
...@@ -325,16 +325,6 @@ static int putreg(struct task_struct *child, ...@@ -325,16 +325,6 @@ static int putreg(struct task_struct *child,
return set_flags(child, value); return set_flags(child, value);
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
/*
* Orig_ax is really just a flag with small positive and
* negative values, so make sure to always sign-extend it
* from 32 bits so that it works correctly regardless of
* whether we come from a 32-bit environment or not.
*/
case offsetof(struct user_regs_struct, orig_ax):
value = (long) (s32) value;
break;
case offsetof(struct user_regs_struct,fs_base): case offsetof(struct user_regs_struct,fs_base):
if (value >= TASK_SIZE_OF(child)) if (value >= TASK_SIZE_OF(child))
return -EIO; return -EIO;
...@@ -1126,10 +1116,15 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value) ...@@ -1126,10 +1116,15 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value)
case offsetof(struct user32, regs.orig_eax): case offsetof(struct user32, regs.orig_eax):
/* /*
* Sign-extend the value so that orig_eax = -1 * A 32-bit debugger setting orig_eax means to restore
* causes (long)orig_ax < 0 tests to fire correctly. * the state of the task restarting a 32-bit syscall.
* Make sure we interpret the -ERESTART* codes correctly
* in case the task is not actually still sitting at the
* exit from a 32-bit syscall with TS_COMPAT still set.
*/ */
regs->orig_ax = (long) (s32) value; regs->orig_ax = value;
if (syscall_get_nr(child, regs) >= 0)
task_thread_info(child)->status |= TS_COMPAT;
break; break;
case offsetof(struct user32, regs.eflags): case offsetof(struct user32, regs.eflags):
......
/* /*
* Access to user system call parameters and results * Access to user system call parameters and results
* *
* Copyright (C) 2008 Red Hat, Inc. All rights reserved. * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
* *
* This copyrighted material is made available to anyone wishing to use, * This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions * modify, copy, or redistribute it subject to the terms and conditions
...@@ -32,9 +32,13 @@ struct pt_regs; ...@@ -32,9 +32,13 @@ struct pt_regs;
* If @task is not executing a system call, i.e. it's blocked * If @task is not executing a system call, i.e. it's blocked
* inside the kernel for a fault or signal, returns -1. * inside the kernel for a fault or signal, returns -1.
* *
* Note this returns int even on 64-bit machines. Only 32 bits of
* system call number can be meaningful. If the actual arch value
* is 64 bits, this truncates to 32 bits so 0xffffffff means -1.
*
* It's only valid to call this when @task is known to be blocked. * It's only valid to call this when @task is known to be blocked.
*/ */
long syscall_get_nr(struct task_struct *task, struct pt_regs *regs); int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);
/** /**
* syscall_rollback - roll back registers after an aborted system call * syscall_rollback - roll back registers after an aborted system call
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment