From a70452e833c4773d85576192aa12bb9172d78373 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 6 Dec 2006 20:37:33 -0800 Subject: [PATCH] --- yaml --- r: 42843 b: refs/heads/master c: 93f210dd9e614ddab7ecef0b4c9ba6ad3720d860 h: refs/heads/master i: 42841: 13d518b55b0a9801fa2f0d8e242957599411277b 42839: 8389d7ae7d31070ba49bab56aaf905903cdbef4d v: v3 --- [refs] | 2 +- trunk/fs/ext2/ioctl.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 48b9e1e15c72..112859a06f8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5738ceed46782aea7663d62cb6398eb05fc4ce0 +refs/heads/master: 93f210dd9e614ddab7ecef0b4c9ba6ad3720d860 diff --git a/trunk/fs/ext2/ioctl.c b/trunk/fs/ext2/ioctl.c index 1dfba77eab10..e3cf8c81507f 100644 --- a/trunk/fs/ext2/ioctl.c +++ b/trunk/fs/ext2/ioctl.c @@ -44,6 +44,7 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, if (!S_ISDIR(inode->i_mode)) flags &= ~EXT2_DIRSYNC_FL; + mutex_lock(&inode->i_mutex); oldflags = ei->i_flags; /* @@ -53,13 +54,16 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, * This test looks nicer. Thanks to Pauline Middelink */ if ((flags ^ oldflags) & (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL)) { - if (!capable(CAP_LINUX_IMMUTABLE)) + if (!capable(CAP_LINUX_IMMUTABLE)) { + mutex_unlock(&inode->i_mutex); return -EPERM; + } } flags = flags & EXT2_FL_USER_MODIFIABLE; flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; + mutex_unlock(&inode->i_mutex); ext2_set_inode_flags(inode); inode->i_ctime = CURRENT_TIME_SEC;