diff options
Diffstat (limited to 'fs/compat_ioctl.c')
-rw-r--r-- | fs/compat_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index cacf8a83e394..229e72218165 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -1199,7 +1199,7 @@ struct space_resv_32 { | |||
1199 | /* just account for different alignment */ | 1199 | /* just account for different alignment */ |
1200 | static int compat_ioctl_preallocate(struct file *file, unsigned long arg) | 1200 | static int compat_ioctl_preallocate(struct file *file, unsigned long arg) |
1201 | { | 1201 | { |
1202 | struct space_resv_32 __user *p32 = (void __user *)arg; | 1202 | struct space_resv_32 __user *p32 = compat_ptr(arg); |
1203 | struct space_resv __user *p = compat_alloc_user_space(sizeof(*p)); | 1203 | struct space_resv __user *p = compat_alloc_user_space(sizeof(*p)); |
1204 | 1204 | ||
1205 | if (copy_in_user(&p->l_type, &p32->l_type, sizeof(s16)) || | 1205 | if (copy_in_user(&p->l_type, &p32->l_type, sizeof(s16)) || |
@@ -2063,7 +2063,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, | |||
2063 | #else | 2063 | #else |
2064 | case FS_IOC_RESVSP: | 2064 | case FS_IOC_RESVSP: |
2065 | case FS_IOC_RESVSP64: | 2065 | case FS_IOC_RESVSP64: |
2066 | error = ioctl_preallocate(filp, (void __user *)arg); | 2066 | error = ioctl_preallocate(filp, compat_ptr(arg)); |
2067 | goto out_fput; | 2067 | goto out_fput; |
2068 | #endif | 2068 | #endif |
2069 | 2069 | ||