fs: add missing compat_ptr handling for FS_IOC_RESVSP ioctl
PATCH 1/1 fs: add missing compat_ptr handling for FS_IOC_RESVSP ioctl
From: Heiko Carstens <[email protected]>
For FS_IOC_RESVSP and FS_IOC_RESVSP64 compat_sys_ioctl() uses its arg argument as a pointer to userspace. However it is missing a a call to compat_ptr() which will do a proper pointer conversion.
This was introduced with 3e63cbb1 "fs: Add new pre-allocation ioctls to vfs for compatibility with legacy xfs ioctls".
--- fs/compat_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/compat_ioctl.c +2 -2
@@ -1800,7 +1800,7 @@ struct space_resv_32 {/* just account for different alignment */ static int compat_ioctl_preallocate (struct file *file,unsigned long arg) { -struct space_resv_32 __user *p32 = (void __user *)arg; +struct space_resv_32 __user *p32 =compat_ptr (arg);struct space_resv __user *p =compat_alloc_user_space (sizeof (*p)); if (copy_in_user(&p->l_type, &p32->l_type, sizeof(s16)) ||
@@ -2802,7 +2802,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,#else case FS_IOC_RESVSP :case FS_IOC_RESVSP64 : - error =ioctl_preallocate (filp, (void __user *)arg); + error =ioctl_preallocate (filp,compat_ptr (arg)); goto out_fput;#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Quoted 10 lines · Heiko Carstens
From: Heiko Carstens <[email protected]>
For
FS_IOC_RESVSPandFS_IOC_RESVSP64compat_sys_ioctl()uses its arg argument as a pointer to userspace. However it is missing a a call tocompat_ptr()which will do a proper pointer conversion.This was introduced with
3e63cbb1"fs: Add new pre-allocation ioctls to vfs for compatibility with legacy xfs ioctls".
Quoted 6 lines
Cc Ankit Jain <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Al Viro <[email protected]>Cc Arnd Bergmann <[email protected]>Acked-by David S. Miller <[email protected]>Signed-off-by Heiko Carstens <[email protected]>
Looks good.