diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 00:40:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 00:40:48 +0100 |
| commit | 5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1 (patch) | |
| tree | a67a6a4499a235a2aab53a61bf1badff484bc345 /arch/x86/mm | |
| parent | Merge commit 'v2.6.29-rc4' into core/percpu (diff) | |
| parent | x86: uaccess: use errret as error value in __put_user_size() (diff) | |
| download | linux-5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1.tar.xz linux-5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1.zip | |
Merge branch 'x86/uaccess' into core/percpu
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/extable.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 7e8db53528a7..61b41ca3b5a2 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -23,6 +23,12 @@ int fixup_exception(struct pt_regs *regs) fixup = search_exception_tables(regs->ip); if (fixup) { + /* If fixup is less than 16, it means uaccess error */ + if (fixup->fixup < 16) { + current_thread_info()->uaccess_err = -EFAULT; + regs->ip += fixup->fixup; + return 1; + } regs->ip = fixup->fixup; return 1; } |