The patch titled fs: add missing compat_ptr handling for FS_IOC_RESVSP ioctl has been removed from the -mm tree. Its filename was fs-add-missing-compat_ptr-handling-for-fs_ioc_resvsp-ioctl.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs: add missing compat_ptr handling for FS_IOC_RESVSP ioctl From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> 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". Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Ankit Jain <me@xxxxxxxxxxxxx> Acked-by: Christoph Hellwig <hch@xxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Acked-by: Arnd Bergmann <arndbergmann@xxxxxxxxxxxxxx> Acked-by: David S. Miller <davem@xxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxx> [2.6.31.x] Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN fs/compat_ioctl.c~fs-add-missing-compat_ptr-handling-for-fs_ioc_resvsp-ioctl fs/compat_ioctl.c --- a/fs/compat_ioctl.c~fs-add-missing-compat_ptr-handling-for-fs_ioc_resvsp-ioctl +++ a/fs/compat_ioctl.c @@ -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(unsigne #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 _ Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html