git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2257_FC5 patched with stable patch-2.6.18.5-vs2.0...
[linux-2.6.git]
/
fs
/
ext2
/
ioctl.c
diff --git
a/fs/ext2/ioctl.c
b/fs/ext2/ioctl.c
index
2520c2f
..
6ef1d95
100644
(file)
--- a/
fs/ext2/ioctl.c
+++ b/
fs/ext2/ioctl.c
@@
-8,8
+8,10
@@
*/
#include "ext2.h"
*/
#include "ext2.h"
+#include <linux/capability.h>
#include <linux/time.h>
#include <linux/sched.h>
#include <linux/time.h>
#include <linux/sched.h>
+#include <linux/mount.h>
#include <asm/current.h>
#include <asm/uaccess.h>
#include <asm/current.h>
#include <asm/uaccess.h>
@@
-29,7
+31,8
@@
int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
case EXT2_IOC_SETFLAGS: {
unsigned int oldflags;
case EXT2_IOC_SETFLAGS: {
unsigned int oldflags;
- if (IS_RDONLY(inode))
+ if (IS_RDONLY(inode) ||
+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
@@
-50,8
+53,8
@@
int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
* This test looks nicer. Thanks to Pauline Middelink
*/
if ((oldflags & EXT2_IMMUTABLE_FL) ||
* This test looks nicer. Thanks to Pauline Middelink
*/
if ((oldflags & EXT2_IMMUTABLE_FL) ||
- ((flags ^ oldflags) &
-
(EXT2_APPEND_FL | EXT2_IMMUTABLE
_FL))) {
+ ((flags ^ oldflags) &
(EXT2_APPEND_FL |
+
EXT2_IMMUTABLE_FL | EXT2_IUNLINK
_FL))) {
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
@@
-61,7
+64,7
@@
int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
ei->i_flags = flags;
ext2_set_inode_flags(inode);
ei->i_flags = flags;
ext2_set_inode_flags(inode);
- inode->i_ctime = CURRENT_TIME;
+ inode->i_ctime = CURRENT_TIME
_SEC
;
mark_inode_dirty(inode);
return 0;
}
mark_inode_dirty(inode);
return 0;
}
@@
-70,11
+73,12
@@
int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
case EXT2_IOC_SETVERSION:
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
return -EPERM;
case EXT2_IOC_SETVERSION:
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
return -EPERM;
- if (IS_RDONLY(inode))
+ if (IS_RDONLY(inode) ||
+ (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
- inode->i_ctime = CURRENT_TIME;
+ inode->i_ctime = CURRENT_TIME
_SEC
;
mark_inode_dirty(inode);
return 0;
default:
mark_inode_dirty(inode);
return 0;
default: