From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 29 May 2009 15:09:08 +0000 (+0100)
Subject: mtd: Fix pointer handling in compat ioctls to use compat_ptr()
X-Git-Tag: v2.6.31-rc1~53^2~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b6585ce05f169f10ce74329e87bd8c5070b4bb9;p=karo-tx-linux.git

mtd: Fix pointer handling in compat ioctls to use compat_ptr()

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 5fff04f3303d..5b081cb84351 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -839,7 +839,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
 	struct inode *inode = file->f_path.dentry->d_inode;
 	struct mtd_file_info *mfi = file->private_data;
 	struct mtd_info *mtd = mfi->mtd;
-	void __user *argp = (void __user *)arg;
+	void __user *argp = compat_ptr(arg);
 	int ret = 0;
 
 	lock_kernel();
@@ -874,7 +874,7 @@ static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
 		break;
 	}
 	default:
-		ret = mtd_ioctl(inode, file, cmd, arg);
+		ret = mtd_ioctl(inode, file, cmd, (unsigned long)argp);
 	}
 
 	unlock_kernel();