| Message ID | 52396549.6040906@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 18, 2013 at 04:33:13PM +0800, 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> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> regards, dan carpenter
On 09/18/2013 04:33 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> > Cc: Jie Liu <jeff.liu@oracle.com> > Cc: Dan Carpenter <dan.carpenter@oracle.com> > --- > fs/ocfs2/move_extents.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c > index 3d3f3c8..0ef308d 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; This fix looks good, but we should also return an meaningful errno if the defragment start offset is larger than the file size in this function, i.e, - if (range.me_start > i_size_read(inode)) + if (range.me_start > i_size_read(inode)) { + status = -EINVAL; goto out_free; + } Thanks, -Jeff
diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c index 3d3f3c8..0ef308d 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;
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> Cc: Jie Liu <jeff.liu@oracle.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> --- fs/ocfs2/move_extents.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)