mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 12:24:38 +00:00
[MTD] mtdchar: Fix MEMGETOOBSEL and ECCGETLAYOUT ioctls
1. The ECCGETLAYOUT ioctl copy_to_user() call has a superfluous '&' causing the resulting information to be garbage rather than the intended mtd->ecclayout. 2. The MEMGETOOBSEL misses copying mtd->ecclayout->eccbytes so the resulting field of the returned structure contains garbage. Signed-off-by: Ricard Wanderlöf <ricardw@axis.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
parent
42cb1403af
commit
d25ade71ef
1 changed files with 2 additions and 1 deletions
|
@ -616,6 +616,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
|
||||||
memcpy(&oi.eccpos, mtd->ecclayout->eccpos, sizeof(oi.eccpos));
|
memcpy(&oi.eccpos, mtd->ecclayout->eccpos, sizeof(oi.eccpos));
|
||||||
memcpy(&oi.oobfree, mtd->ecclayout->oobfree,
|
memcpy(&oi.oobfree, mtd->ecclayout->oobfree,
|
||||||
sizeof(oi.oobfree));
|
sizeof(oi.oobfree));
|
||||||
|
oi.eccbytes = mtd->ecclayout->eccbytes;
|
||||||
|
|
||||||
if (copy_to_user(argp, &oi, sizeof(struct nand_oobinfo)))
|
if (copy_to_user(argp, &oi, sizeof(struct nand_oobinfo)))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
@ -715,7 +716,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
|
||||||
if (!mtd->ecclayout)
|
if (!mtd->ecclayout)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
if (copy_to_user(argp, &mtd->ecclayout,
|
if (copy_to_user(argp, mtd->ecclayout,
|
||||||
sizeof(struct nand_ecclayout)))
|
sizeof(struct nand_ecclayout)))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue