--- fs/gfs2/file.c

+++ fs/gfs2/file.c

@@ -218,6 +218,11 @@ static int do_gfs2_set_flags(struct file

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 *f

{

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)

@@ -606,7 +613,7 @@ static int gfs2_lock(struct file *file,

if (!(fl->fl_flags & FL_POSIX))

return -ENOLCK;

- if (__mandatory_lock(&ip->i_inode))

+ if (__mandatory_lock(&ip->i_inode) && fl->fl_type != F_UNLCK)

return -ENOLCK;

if (cmd == F_CANCELLK) {