* [Ocfs2-devel] [PATCH V2] ocfs2: Add missing errno in ocfs2_ioctl_move_extents()
@ 2013-09-18 10:08 Younger Liu
2013-09-18 10:20 ` Jeff Liu
0 siblings, 1 reply; 2+ messages in thread
From: Younger Liu @ 2013-09-18 10:08 UTC (permalink / raw)
To: ocfs2-devel
If the file is not regular or writeable, it should return errno(EPERM).
This patch is based on commit 85a258b70d4891a443583530f48ab734a31e2d8d.
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>
---
fs/ocfs2/move_extents.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 3d3f3c8..9385fa8 100644
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -1067,8 +1067,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;
@@ -1090,8 +1092,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;
--
1.7.9.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Ocfs2-devel] [PATCH V2] ocfs2: Add missing errno in ocfs2_ioctl_move_extents()
2013-09-18 10:08 [Ocfs2-devel] [PATCH V2] ocfs2: Add missing errno in ocfs2_ioctl_move_extents() Younger Liu
@ 2013-09-18 10:20 ` Jeff Liu
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Liu @ 2013-09-18 10:20 UTC (permalink / raw)
To: ocfs2-devel
On 09/18/2013 06:08 PM, Younger Liu wrote:
> If the file is not regular or writeable, it should return errno(EPERM).
>
> This patch is based on commit 85a258b70d4891a443583530f48ab734a31e2d8d.
>
> 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>
Looks good to me, thanks.
(BTW, there is no need to add my SOB because I'm not in patch submission path :)).
Reviewed-by: Jie Liu <jeff.liu@oracle.com>
> ---
> fs/ocfs2/move_extents.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
> index 3d3f3c8..9385fa8 100644
> --- a/fs/ocfs2/move_extents.c
> +++ b/fs/ocfs2/move_extents.c
> @@ -1067,8 +1067,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;
> @@ -1090,8 +1092,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;
> -- 1.7.9.7
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-18 10:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-18 10:08 [Ocfs2-devel] [PATCH V2] ocfs2: Add missing errno in ocfs2_ioctl_move_extents() Younger Liu
2013-09-18 10:20 ` Jeff Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.