[MTD] mtdchar: Fix MEMGETOOBSEL and ECCGETLAYOUT ioctls (d25ade71) · Commits · 戴 / test

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>

drivers/mtd/mtdchar.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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.oobfree, mtd->ecclayout->oobfree,
		sizeof(oi.oobfree));
		oi.eccbytes = mtd->ecclayout->eccbytes;

		if (copy_to_user(argp, &oi, sizeof(struct nand_oobinfo)))
		return -EFAULT;
		@@ -715,7 +716,7 @@ static int mtd_ioctl(struct inode inode, struct file file,
		if (!mtd->ecclayout)
		return -EOPNOTSUPP;

		if (copy_to_user(argp, &mtd->ecclayout,
		if (copy_to_user(argp, mtd->ecclayout,
		sizeof(struct nand_ecclayout)))
		return -EFAULT;
		break;

Admin message