2 files changed, 180 insertions, 126 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index ad4b8618977d..51bb0b092003 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
 #include <linux/backing-dev.h>
+#include <linux/compat.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/compatmac.h>
@@ -355,6 +356,100 @@ static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
 # define otp_select_filemode(f,m)       -EOPNOTSUPP
 #endif
 
+static int mtd_do_writeoob(struct file *file, struct mtd_info *mtd,
+        uint64_t start, uint32_t length, void __user *ptr,
+        uint32_t __user *retp)
+{
+        struct mtd_oob_ops ops;
+        uint32_t retlen;
+        int ret = 0;
+
+        if (!(file->f_mode & FMODE_WRITE))
+                return -EPERM;
+
+        if (length > 4096)
+                return -EINVAL;
+
+        if (!mtd->write_oob)
+                ret = -EOPNOTSUPP;
+        else
+                ret = access_ok(VERIFY_READ, ptr, length) ? 0 : EFAULT;
+
+        if (ret)
+                return ret;
+
+        ops.ooblen = length;
+        ops.ooboffs = start & (mtd->oobsize - 1);
+        ops.datbuf = NULL;
+        ops.mode = MTD_OOB_PLACE;
+
+        if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))
+                return -EINVAL;
+
+        ops.oobbuf = kmalloc(length, GFP_KERNEL);
+        if (!ops.oobbuf)
+                return -ENOMEM;
+
+        if (copy_from_user(ops.oobbuf, ptr, length)) {
+                kfree(ops.oobbuf);
+                return -EFAULT;
+        }
+
+        start &= ~((uint64_t)mtd->oobsize - 1);
+        ret = mtd->write_oob(mtd, start, &ops);
+
+        if (ops.oobretlen > 0xFFFFFFFFU)
+                ret = -EOVERFLOW;
+        retlen = ops.oobretlen;
+        if (copy_to_user(retp, &retlen, sizeof(length)))
+                ret = -EFAULT;
+
+        kfree(ops.oobbuf);
+        return ret;
+}
+
+static int mtd_do_readoob(struct mtd_info *mtd, uint64_t start,
+        uint32_t length, void __user *ptr, uint32_t __user *retp)
+{
+        struct mtd_oob_ops ops;
+        int ret = 0;
+
+        if (length > 4096)
+                return -EINVAL;
+
+        if (!mtd->read_oob)
+                ret = -EOPNOTSUPP;
+        else
+                ret = access_ok(VERIFY_WRITE, ptr,
+                                length) ? 0 : -EFAULT;
+        if (ret)
+                return ret;
+
+        ops.ooblen = length;
+        ops.ooboffs = start & (mtd->oobsize - 1);
+        ops.datbuf = NULL;
+        ops.mode = MTD_OOB_PLACE;
+
+        if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))
+                return -EINVAL;
+
+        ops.oobbuf = kmalloc(length, GFP_KERNEL);
+        if (!ops.oobbuf)
+                return -ENOMEM;
+
+        start &= ~((uint64_t)mtd->oobsize - 1);
+        ret = mtd->read_oob(mtd, start, &ops);
+
+        if (put_user(ops.oobretlen, retp))
+                ret = -EFAULT;
+        else if (ops.oobretlen && copy_to_user(ptr, ops.oobbuf,
+                                            ops.oobretlen))
+                ret = -EFAULT;
+
+        kfree(ops.oobbuf);
+        return ret;
+}
+
 static int mtd_ioctl(struct inode *inode, struct file *file,
                      u_int cmd, u_long arg)
 {
@@ -487,100 +582,28 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         case MEMWRITEOOB:
         {
                 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 & FMODE_WRITE))
-                        return -EPERM;
-
-                if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
-                        return -EFAULT;
-
-                if (buf.length > 4096)
-                        return -EINVAL;
-
-                if (!mtd->write_oob)
-                        ret = -EOPNOTSUPP;
-                else
-                        ret = access_ok(VERIFY_READ, buf.ptr,
-                                        buf.length) ? 0 : EFAULT;
-
-                if (ret)
-                        return ret;
-
-                ops.ooblen = buf.length;
-                ops.ooboffs = buf.start & (mtd->oobsize - 1);
-                ops.datbuf = NULL;
-                ops.mode = MTD_OOB_PLACE;
-
-                if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))
-                        return -EINVAL;
-
-                ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
-                if (!ops.oobbuf)
-                        return -ENOMEM;
-
-                if (copy_from_user(ops.oobbuf, buf.ptr, buf.length)) {
-                        kfree(ops.oobbuf);
-                        return -EFAULT;
-                }
-
-                buf.start &= ~(mtd->oobsize - 1);
-                ret = mtd->write_oob(mtd, buf.start, &ops);
+                struct mtd_oob_buf __user *buf_user = argp;
 
-                if (ops.oobretlen > 0xFFFFFFFFU)
-                        ret = -EOVERFLOW;
-                retlen = ops.oobretlen;
-                if (copy_to_user(&user_buf->length, &retlen, sizeof(buf.length)))
+                /* NOTE: writes return length to buf_user->length */
+                if (copy_from_user(&buf, argp, sizeof(buf)))
                         ret = -EFAULT;
-
-                kfree(ops.oobbuf);
+                else
+                        ret = mtd_do_writeoob(file, mtd, buf.start, buf.length,
+                                buf.ptr, &buf_user->length);
                 break;
-
         }
 
         case MEMREADOOB:
         {
                 struct mtd_oob_buf buf;
-                struct mtd_oob_ops ops;
-
-                if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
-                        return -EFAULT;
-
-                if (buf.length > 4096)
-                        return -EINVAL;
-
-                if (!mtd->read_oob)
-                        ret = -EOPNOTSUPP;
-                else
-                        ret = access_ok(VERIFY_WRITE, buf.ptr,
-                                        buf.length) ? 0 : -EFAULT;
-                if (ret)
-                        return ret;
-
-                ops.ooblen = buf.length;
-                ops.ooboffs = buf.start & (mtd->oobsize - 1);
-                ops.datbuf = NULL;
-                ops.mode = MTD_OOB_PLACE;
+                struct mtd_oob_buf __user *buf_user = argp;
 
-                if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))
-                        return -EINVAL;
-
-                ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
-                if (!ops.oobbuf)
-                        return -ENOMEM;
-
-                buf.start &= ~(mtd->oobsize - 1);
-                ret = mtd->read_oob(mtd, buf.start, &ops);
-
-                if (put_user(ops.oobretlen, (uint32_t __user *)argp))
-                        ret = -EFAULT;
-                else if (ops.oobretlen && copy_to_user(buf.ptr, ops.oobbuf,
-                                                    ops.oobretlen))
+                /* NOTE: writes return length to buf_user->start */
+                if (copy_from_user(&buf, argp, sizeof(buf)))
                         ret = -EFAULT;
-
-                kfree(ops.oobbuf);
+                else
+                        ret = mtd_do_readoob(mtd, buf.start, buf.length,
+                                buf.ptr, &buf_user->start);
                 break;
         }
 
@@ -771,6 +794,67 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         return ret;
 } /* memory_ioctl */
 
+#ifdef CONFIG_COMPAT
+
+struct mtd_oob_buf32 {
+        u_int32_t start;
+        u_int32_t length;
+        compat_caddr_t ptr;     /* unsigned char* */
+};
+
+#define MEMWRITEOOB32           _IOWR('M', 3, struct mtd_oob_buf32)
+#define MEMREADOOB32            _IOWR('M', 4, struct mtd_oob_buf32)
+
+static long mtd_compat_ioctl(struct file *file, unsigned int cmd,
+        unsigned long arg)
+{
+        struct mtd_file_info *mfi = file->private_data;
+        struct mtd_info *mtd = mfi->mtd;
+        void __user *argp = (void __user *)arg;
+        int ret = 0;
+
+        lock_kernel();
+
+        switch (cmd) {
+        case MEMWRITEOOB32:
+        {
+                struct mtd_oob_buf32 buf;
+                struct mtd_oob_buf32 __user *buf_user = argp;
+
+                if (copy_from_user(&buf, argp, sizeof(buf)))
+                        ret = -EFAULT;
+                else
+                        ret = mtd_do_writeoob(file, mtd, buf.start,
+                                buf.length, compat_ptr(buf.ptr),
+                                &buf_user->length);
+                break;
+        }
+
+        case MEMREADOOB32:
+        {
+                struct mtd_oob_buf32 buf;
+                struct mtd_oob_buf32 __user *buf_user = argp;
+
+                /* NOTE: writes return length to buf->start */
+                if (copy_from_user(&buf, argp, sizeof(buf)))
+                        ret = -EFAULT;
+                else
+                        ret = mtd_do_readoob(mtd, buf.start,
+                                buf.length, compat_ptr(buf.ptr),
+                                &buf_user->start);
+                break;
+        }
+        default:
+                ret = -ENOIOCTLCMD;
+        }
+
+        unlock_kernel();
+
+        return ret;
+}
+
+#endif /* CONFIG_COMPAT */
+
 /*
  * try to determine where a shared mapping can be made
  * - only supported for NOMMU at the moment (MMU can't doesn't copy private
@@ -830,6 +914,9 @@ static const struct file_operations mtd_fops = {
         .read           = mtd_read,
         .write          = mtd_write,
         .ioctl          = mtd_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = mtd_compat_ioctl,
+#endif
         .open           = mtd_open,
         .release        = mtd_close,
         .mmap           = mtd_mmap,
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index c603ca2c223a..196397bff086 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1411,46 +1411,6 @@ static int ioc_settimeout(unsigned int fd, unsigned int cmd, unsigned long arg)
 #define HIDPGETCONNLIST _IOR('H', 210, int)
 #define HIDPGETCONNINFO _IOR('H', 211, int)
 
-struct mtd_oob_buf32 {
-        u_int32_t start;
-        u_int32_t length;
-        compat_caddr_t ptr;     /* unsigned char* */
-};
-
-#define MEMWRITEOOB32   _IOWR('M',3,struct mtd_oob_buf32)
-#define MEMREADOOB32    _IOWR('M',4,struct mtd_oob_buf32)
-
-static int mtd_rw_oob(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-        struct mtd_oob_buf __user *buf = compat_alloc_user_space(sizeof(*buf));
-        struct mtd_oob_buf32 __user *buf32 = compat_ptr(arg);
-        u32 data;
-        char __user *datap;
-        unsigned int real_cmd;
-        int err;
-
-        real_cmd = (cmd == MEMREADOOB32) ?
-                MEMREADOOB : MEMWRITEOOB;
-
-        if (copy_in_user(&buf->start, &buf32->start,
-                         2 * sizeof(u32)) ||
-            get_user(data, &buf32->ptr))
-                return -EFAULT;
-        datap = compat_ptr(data);
-        if (put_user(datap, &buf->ptr))
-                return -EFAULT;
-
-        err = sys_ioctl(fd, real_cmd, (unsigned long) buf);
-
-        if (!err) {
-                if (copy_in_user(&buf32->start, &buf->start,
-                                 2 * sizeof(u32)))
-                        err = -EFAULT;
-        }
-
-        return err;
-}       
-
 #ifdef CONFIG_BLOCK
 struct raw32_config_request
 {
@@ -2439,8 +2399,17 @@ COMPATIBLE_IOCTL(MEMLOCK)
 COMPATIBLE_IOCTL(MEMUNLOCK)
 COMPATIBLE_IOCTL(MEMGETREGIONCOUNT)
 COMPATIBLE_IOCTL(MEMGETREGIONINFO)
+COMPATIBLE_IOCTL(MEMSETOOBSEL)
+COMPATIBLE_IOCTL(MEMGETOOBSEL)
 COMPATIBLE_IOCTL(MEMGETBADBLOCK)
 COMPATIBLE_IOCTL(MEMSETBADBLOCK)
+COMPATIBLE_IOCTL(OTPSELECT)
+COMPATIBLE_IOCTL(OTPGETREGIONCOUNT)
+COMPATIBLE_IOCTL(OTPGETREGIONINFO)
+COMPATIBLE_IOCTL(OTPLOCK)
+COMPATIBLE_IOCTL(ECCGETLAYOUT)
+COMPATIBLE_IOCTL(ECCGETSTATS)
+COMPATIBLE_IOCTL(MTDFILEMODE)
 COMPATIBLE_IOCTL(MEMERASE64)
 /* NBD */
 ULONG_IOCTL(NBD_SET_SOCK)
@@ -2551,8 +2520,6 @@ COMPATIBLE_IOCTL(JSIOCGBUTTONS)
 COMPATIBLE_IOCTL(JSIOCGNAME(0))
 
 /* now things that need handlers */
-HANDLE_IOCTL(MEMREADOOB32, mtd_rw_oob)
-HANDLE_IOCTL(MEMWRITEOOB32, mtd_rw_oob)
 #ifdef CONFIG_NET
 HANDLE_IOCTL(SIOCGIFNAME, dev_ifname32)
 HANDLE_IOCTL(SIOCGIFCONF, dev_ifconf)