diff options
| author | Andi Kleen <ak@suse.de> | 2004-03-21 03:31:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-21 03:31:12 -0800 |
| commit | 3111cd4c26b4f38e40d2f56e8d5d8abc9ce8baae (patch) | |
| tree | ef08c3f9977533a0f4e6daaea8cd7d3e8f0f8ac2 | |
| parent | 9a45400e68ed622a4e7024018c1a4195fab165fa (diff) | |
[PATCH] Two more x86-64 fixes
- Fix CONFIG_DEBUG_INFO build again
- Fix user exploitable oops in ia32 ioctl emulation
| -rw-r--r-- | arch/x86_64/ia32/ia32_ioctl.c | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/calling.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c index e8ca991c2cf0..7a15b83eb637 100644 --- a/arch/x86_64/ia32/ia32_ioctl.c +++ b/arch/x86_64/ia32/ia32_ioctl.c @@ -27,7 +27,7 @@ static int tiocgdev(unsigned fd, unsigned cmd, unsigned int *ptr) struct file *file = fget(fd); struct tty_struct *real_tty; - if (!fd) + if (!file) return -EBADF; if (file->f_op->ioctl != tty_ioctl) return -EINVAL; diff --git a/include/asm-x86_64/calling.h b/include/asm-x86_64/calling.h index 7a1b854e9c49..b773861e3d94 100644 --- a/include/asm-x86_64/calling.h +++ b/include/asm-x86_64/calling.h @@ -56,7 +56,7 @@ movq %r10,1*8(%rsp) CFI_REL_OFFSET r10,1*8 movq %r11,(%rsp) - CFI_OFFSET r11 + CFI_REL_OFFSET r11,0*8 .endif .endm |