From 5f5367d66e1db14eecec58385a90404f54aac2f0 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 3 Jul 2008 23:40:13 -0700 Subject: [PATCH] --- yaml --- r: 106431 b: refs/heads/master c: 5f6928378b165c4b0d57a711e1c1eb925ad33846 h: refs/heads/master i: 106429: b284e2af605d41b515735807904cec648d46d2dc 106427: 984fcf321040dbe871c9964348ceecf2a3571c88 106423: fb7cacf1d749d5d7bbbe364728b929cbb0d27122 106415: 7258af6a1d542d5002f92a3feeb07d28e4ea87b6 106399: d2254bea3abe845b49168d130afcc62a635891f1 106367: 736060be62e3a5c487003707ef0029cd3a411008 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdchar.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee583934776c..58dc69b5740e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72289824423655e67993c25c91a7a86a34917209 +refs/heads/master: 5f6928378b165c4b0d57a711e1c1eb925ad33846 diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c index 4b3156f9b36f..5fc2c4216c03 100644 --- a/trunk/drivers/mtd/mtdchar.c +++ b/trunk/drivers/mtd/mtdchar.c @@ -479,6 +479,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file, { struct mtd_oob_buf buf; struct mtd_oob_ops ops; + struct mtd_oob_buf __user *user_buf = argp; uint32_t retlen; if(!(file->f_mode & 2)) @@ -522,8 +523,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file, if (ops.oobretlen > 0xFFFFFFFFU) ret = -EOVERFLOW; retlen = ops.oobretlen; - if (copy_to_user(&((struct mtd_oob_buf *)argp)->length, - &retlen, sizeof(buf.length))) + if (copy_to_user(&user_buf->length, &retlen, sizeof(buf.length))) ret = -EFAULT; kfree(ops.oobbuf);