diff options
author | Roland McGrath <roland@redhat.com> | 2009-09-23 02:57:51 (GMT) |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 2009-09-23 02:57:51 (GMT) |
commit | 18c1e2c80d92adca50ffc654617639a4aa35f29c (patch) | |
tree | 7673fb1f3b98ccc3c1ded9cacbf24894fefd99b2 /arch | |
parent | 268e46712d57a6493cc0f98e7d200a0f674c31ed (diff) | |
download | linux-18c1e2c80d92adca50ffc654617639a4aa35f29c.tar.xz |
x86: syscall_get_nr returns int
Make syscall_get_nr() return int, so we always sign-extend
the low 32 bits of orig_ax in checks.
Signed-off-by: Roland McGrath <roland@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/syscall.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index d82f39b..8d33bc5 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -1,7 +1,7 @@ /* * 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, * modify, copy, or redistribute it subject to the terms and conditions @@ -16,13 +16,13 @@ #include <linux/sched.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. + */ +static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs) { - /* - * We always sign-extend a -1 value being set here, - * so this is always either -1L or a syscall number. - */ return regs->orig_ax; } |