ocfs2: add missing errno in ocfs2_ioctl_move_extents()

If the file is not regular or writeable, it should return errno(EPERM).

This patch is based on 85a258b70d ("ocfs2: fix error handling in
ocfs2_ioctl_move_extents()").

Signed-off-by: Younger Liu <younger.liu@huawei.com>
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jie Liu <jeff.liu@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 445678d9163c257e9bbc398748b0556287a538ee..631a98213474406b339908968bf7e83157051d34 100644 (file)
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -1066,8 +1066,10 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
        if (status)
                return status;
 
-       if ((!S_ISREG(inode->i_mode)) || !(filp->f_mode & FMODE_WRITE))
+       if ((!S_ISREG(inode->i_mode)) || !(filp->f_mode & FMODE_WRITE)) {
+               status = -EPERM;
                goto out_drop;
+       }
 
        if (inode->i_flags & (S_IMMUTABLE|S_APPEND)) {
                status = -EPERM;
@@ -1089,8 +1091,10 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
                goto out_free;
        }
 
-       if (range.me_start > i_size_read(inode))
+       if (range.me_start > i_size_read(inode)) {
+               status = -EINVAL;
                goto out_free;
+       }
 
        if (range.me_start + range.me_len > i_size_read(inode))
                        range.me_len = i_size_read(inode) - range.me_start;