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

Commit bfbca926 authored by Younger Liu's avatar Younger Liu Committed by Linus Torvalds
Browse files

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 85a258b7 ("ocfs2: fix error handling in
ocfs2_ioctl_move_extents()").

Signed-off-by: default avatarYounger Liu <younger.liu@huawei.com>
Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarJie Liu <jeff.liu@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8abaae8d

fs/ocfs2/move_extents.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1066,8 +1066,10 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp) 
	if (status)

	if (status)

		return 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;

		goto out_drop;

	}





	if (inode->i_flags & (S_IMMUTABLE|S_APPEND)) {

	if (inode->i_flags & (S_IMMUTABLE|S_APPEND)) {

		status = -EPERM;

		status = -EPERM;
@@ -1089,8 +1091,10 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp) 
		goto out_free;

		goto out_free;

	}

	}





	if (range.me_start > i_size_read(inode))

	if (range.me_start > i_size_read(inode)) {

		status = -EINVAL;

		goto out_free;

		goto out_free;

	}





	if (range.me_start + range.me_len > i_size_read(inode))

	if (range.me_start + range.me_len > i_size_read(inode))

			range.me_len = i_size_read(inode) - range.me_start;

			range.me_len = i_size_read(inode) - range.me_start;