[PATCH] Two more x86-64 fixes

- Fix CONFIG_DEBUG_INFO build again - Fix user exploitable oops in ia32 ioctl emulation

[PATCH] Two more x86-64 fixes
- Fix CONFIG_DEBUG_INFO build again - Fix user exploitable oops in ia32 ioctl emulation
3111cd4c · Andi Kleen · Linus Torvalds · 9a45400e · 3111cd4c · 3111cd4c
Commit 3111cd4c authored Mar 21, 2004 by Andi Kleen Committed by Linus Torvalds Mar 21, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/x86_64/ia32/ia32_ioctl.c arch/x86_64/ia32/ia32_ioctl.c +1 -1

include/asm-x86_64/calling.h include/asm-x86_64/calling.h +1 -1

No files found.
--- 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; 

--- 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