Commit e9d8d482 authored by David Scidmore's avatar David Scidmore Committed by David Woodhouse

[MTD] mtdchar.c: ioctl always returns 0 as size written for ppc64

"include/linux/mtd/mtd.h" declares "mtd_oob_ops.retlen" as size_t, which
is 64 bits on targets with a 64 bit addressing. The MEMWRITEOOB ioctl
calls copy_to_user() to write it back to "mtd_oob_buf.length", which is
declared in "include/linux/mtd-abi.h" as uint32_t. Since powerpc is a
big endian architecture, this only copies the upper 32 bits of the
address, which is always 0.
Signed-off-by: default avatarDavid Scidmore <dscidmore@xes-inc.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 4b3cc340
...@@ -483,6 +483,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file, ...@@ -483,6 +483,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
{ {
struct mtd_oob_buf buf; struct mtd_oob_buf buf;
struct mtd_oob_ops ops; struct mtd_oob_ops ops;
uint32_t retlen;
if(!(file->f_mode & 2)) if(!(file->f_mode & 2))
return -EPERM; return -EPERM;
...@@ -522,8 +523,11 @@ static int mtd_ioctl(struct inode *inode, struct file *file, ...@@ -522,8 +523,11 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
buf.start &= ~(mtd->oobsize - 1); buf.start &= ~(mtd->oobsize - 1);
ret = mtd->write_oob(mtd, buf.start, &ops); ret = mtd->write_oob(mtd, buf.start, &ops);
if (copy_to_user(argp + sizeof(uint32_t), &ops.oobretlen, if (ops.oobretlen > 0xFFFFFFFFU)
sizeof(uint32_t))) ret = -EOVERFLOW;
retlen = ops.oobretlen;
if (copy_to_user(&((struct mtd_oob_buf *)argp)->length,
&retlen, sizeof(buf.length)))
ret = -EFAULT; ret = -EFAULT;
kfree(ops.oobbuf); kfree(ops.oobbuf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment