diff options
author | Andy Lutomirski <luto@kernel.org> | 2016-03-22 17:25:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 18:36:02 -0400 |
commit | a25045ff32dfb4d28c650560d5f2a82c1773dd1c (patch) | |
tree | 2bf5af2237f8dcd102783e716f7513b2601363d8 /drivers/firewire/core-cdev.c | |
parent | 2bf8c47626599c54ab072a29ef1c294d3cce6b0a (diff) |
firewire: use in_compat_syscall to check ioctl compatness
Firewire was using is_compat_task to check whether it was in a compat
ioctl or a non-compat ioctl. Use is_compat_syscall instead so it works
properly on all architectures.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/firewire/core-cdev.c')
-rw-r--r-- | drivers/firewire/core-cdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 36a7c2d89a01..aee149bdf4c0 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c | |||
@@ -221,7 +221,7 @@ struct inbound_phy_packet_event { | |||
221 | #ifdef CONFIG_COMPAT | 221 | #ifdef CONFIG_COMPAT |
222 | static void __user *u64_to_uptr(u64 value) | 222 | static void __user *u64_to_uptr(u64 value) |
223 | { | 223 | { |
224 | if (is_compat_task()) | 224 | if (in_compat_syscall()) |
225 | return compat_ptr(value); | 225 | return compat_ptr(value); |
226 | else | 226 | else |
227 | return (void __user *)(unsigned long)value; | 227 | return (void __user *)(unsigned long)value; |
@@ -229,7 +229,7 @@ static void __user *u64_to_uptr(u64 value) | |||
229 | 229 | ||
230 | static u64 uptr_to_u64(void __user *ptr) | 230 | static u64 uptr_to_u64(void __user *ptr) |
231 | { | 231 | { |
232 | if (is_compat_task()) | 232 | if (in_compat_syscall()) |
233 | return ptr_to_compat(ptr); | 233 | return ptr_to_compat(ptr); |
234 | else | 234 | else |
235 | return (u64)(unsigned long)ptr; | 235 | return (u64)(unsigned long)ptr; |