Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f692837 authored by Harvey Harrison's avatar Harvey Harrison Committed by David Woodhouse
Browse files

[MTD] mtdchar.c silence sparse warning 



The copy_to_user was casting away the address space to get the offset of
the length member.  Use offsetof() instead and add it to the void __user
*argp.

drivers/mtd/mtdchar.c:527:23: warning: cast removes address space of expression
drivers/mtd/mtdchar.c:527:23: warning: incorrect type in argument 1 (different address spaces)
drivers/mtd/mtdchar.c:527:23:    expected void [noderef] <asn:1>*to
drivers/mtd/mtdchar.c:527:23:    got unsigned int *<noident>

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 72289824

drivers/mtd/mtdchar.c

+2 −2
Original line number Diff line number Diff line
@@ -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);