diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2010-05-24 14:36:48 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-05-24 14:36:48 +0100 |
| commit | 7df0e0397b9a18358573274db9fdab991941062f (patch) | |
| tree | 2cfad1129b631ade909dc75e32a0ea48f3899a28 /fs/gfs2 | |
| parent | f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e (diff) | |
| download | op-kernel-dev-7df0e0397b9a18358573274db9fdab991941062f.zip op-kernel-dev-7df0e0397b9a18358573274db9fdab991941062f.tar.gz | |
GFS2: Fix permissions checking for setflags ioctl()
We should be checking for the ownership of the file for which
flags are being set, rather than just for write access.
Reported-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/file.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index e6dd2ae..b20bfcc 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -218,6 +218,11 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) if (error) goto out_drop_write; + error = -EACCES; + if (!is_owner_or_cap(inode)) + goto out; + + error = 0; flags = ip->i_diskflags; new_flags = (flags & ~mask) | (reqflags & mask); if ((new_flags ^ flags) == 0) @@ -275,8 +280,10 @@ static int gfs2_set_flags(struct file *filp, u32 __user *ptr) { struct inode *inode = filp->f_path.dentry->d_inode; u32 fsflags, gfsflags; + if (get_user(fsflags, ptr)) return -EFAULT; + gfsflags = fsflags_cvt(fsflags_to_gfs2, fsflags); if (!S_ISDIR(inode->i_mode)) { if (gfsflags & GFS2_DIF_INHERIT_JDATA) |
