nilfs2: use fixed sized types for ioctl structures

Nilfs ioctl had structures not having fixed sized types such as:

  struct nilfs_argv {
         void *v_base;
         size_t v_nmembs;
         size_t v_size;
         int v_index;
         int v_flags;
  };

Further, some of them are wrongly aligned:

  e.g.

  struct nilfs_cpmode {
        __u64 cm_cno;
        int cm_mode;
  };

The size of wrongly aligned structures varies depending on
architectures, and it breaks the identity of ioctl commands, which
leads to arch dependent errors.

Previously, these are compensated by using compat_ioctl.

This fixes these problems and allows removal of compat ioctl.

Since this will change sizes of those structures, binary compatibility
for the past utilities will once break; new utilities have to be used
instead.  However, it would be helpful to avoid platform dependent
problems in the long term.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
index 85a291ccc1be..7fbd9fe1d035 100644
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
@@ -41,6 +41,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,
                                                    void *, size_t, size_t))
 {
         void *buf;
+        void __user *base = (void __user *)(unsigned long)argv->v_base;
         size_t maxmembs, total, n;
         ssize_t nr;
         int ret, i;
@@ -64,9 +65,8 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,
                 n = (argv->v_nmembs - i < maxmembs) ?
                         argv->v_nmembs - i : maxmembs;
                 if ((dir & _IOC_WRITE) &&
-                    copy_from_user(buf,
-                            (void __user *)argv->v_base + argv->v_size * i,
-                            argv->v_size * n)) {
+                    copy_from_user(buf, base + argv->v_size * i,
+                                   argv->v_size * n)) {
                         ret = -EFAULT;
                         break;
                 }
@@ -78,9 +78,8 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,
                         break;
                 }
                 if ((dir & _IOC_READ) &&
-                    copy_to_user(
-                            (void __user *)argv->v_base + argv->v_size * i,
-                            buf, argv->v_size * nr)) {
+                    copy_to_user(base + argv->v_size * i, buf,
+                                 argv->v_size * nr)) {
                         ret = -EFAULT;
                         break;
                 }