BME 0.06.1 MNT_IS_RDONLY checks
Subsystems (5)
PATCH 6/6 BME 0.06.1 MNT_IS_RDONLY checks
;
; Bind Mount Extensions
;
; This part adds appropriate vfsmount checks (regarding ro) ; in various places like: report_statvfs*, *_ioctl, *utime*, ; *chmod*, and *permission (wherever RDONLY is verified) ;
; Copyright (C) 2003-2005 Herbert Pötzl <[email protected]> ;
; Changelog:
;
; 0.01 - broken out part from bme0.05 ; 0.02 - removed redundant checks
;
; this patch is free software; you can redistribute it and/or ; modify it under the terms of the GNU General Public License ; as published by the Free Software Foundation; either version 2 ; of the License, or (at your option) any later version. ;
; this patch is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ; GNU General Public License for more details.
;
arch/sparc64/solaris/fs.c +2 -2
@@ -362,7 +362,7 @@ static int report_statvfs(struct vfsmounint j =strlen (p);if (j >15 ) j =15 ; -if (IS_RDONLY (inode)) i =1 ; +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (mnt)) i =1 ;if (mnt->mnt_flags &MNT_NOSUID ) i |=2 ;if (!sysv_valid_dev (inode->i_sb->s_dev))return -EOVERFLOW ;
@@ -398,7 +398,7 @@ static int report_statvfs64(struct vfsmoint j =strlen (p);if (j >15 ) j =15 ; -if (IS_RDONLY (inode)) i =1 ; +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (mnt)) i =1 ;if (mnt->mnt_flags &MNT_NOSUID ) i |=2 ;if (!sysv_valid_dev (inode->i_sb->s_dev))return -EOVERFLOW ;
fs/ext2/ioctl.c +4 -2
@@ -29,7 +29,8 @@ int ext2_ioctl (struct inode * inode, stcase 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 ))
@@ -68,7 +69,8 @@ int ext2_ioctl (struct inode * inode, stcase 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 ;
fs/ext3/ioctl.c +10 -5
@@ -35,7 +35,8 @@ int ext3_ioctl (struct inode * inode, stunsigned int oldflags;unsigned int jflag; -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 ))
@@ -111,7 +112,8 @@ flags_err: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 (generation, (int __user *) arg))return -EFAULT ;
@@ -162,7 +164,8 @@ flags_err:if (!test_opt (inode->i_sb,RESERVATION ) ||!S_ISREG (inode->i_mode))return -ENOTTY ; -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 ))
@@ -183,7 +186,8 @@ flags_err:if (!capable (CAP_SYS_RESOURCE ))return -EPERM ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) || + (filp &&MNT_IS_RDONLY (filp->f_vfsmnt)))return -EROFS ;if (get_user (n_blocks_count, (__u32 __user *)arg))
@@ -204,7 +208,8 @@ flags_err:if (!capable (CAP_SYS_RESOURCE ))return -EPERM ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) || + (filp &&MNT_IS_RDONLY (filp->f_vfsmnt)))return -EROFS ; if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
fs/hfsplus/ioctl.c +2 -1
@@ -34,7 +34,8 @@ int hfsplus_ioctl(struct inode *inode, s flags |=EXT2_FLAG_NODUMP ;/* EXT2_NODUMP_FL */ return put_user (flags, (int __user *)arg);case HFSPLUS_IOC_EXT2_SETFLAGS : { -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 ))
fs/namei.c +6 -2
@@ -220,7 +220,7 @@ int permission(struct inode *inode, int/* * Nobody gets write access to a read-only fs. */ -if (IS_RDONLY (inode) && +if ((IS_RDONLY (inode) || (nd &&MNT_IS_RDONLY (nd->mnt))) && (S_ISREG (mode) ||S_ISDIR (mode) ||S_ISLNK (mode)))return -EROFS ;
@@ -1289,7 +1289,8 @@ int may_open(struct nameidata *nd, int areturn -EACCES ; flag &= ~O_TRUNC ; - }else if (IS_RDONLY (inode) && (flag &FMODE_WRITE )) + }else if ((IS_RDONLY (inode) ||MNT_IS_RDONLY (nd->mnt)) + && (flag &FMODE_WRITE ))return -EROFS ;/* * An append-only file must be opened in append mode for writing.
@@ -2198,6 +2199,9 @@ static inline int do_rename(const char * error = -EINVAL ;if (old_dentry == trap) goto exit4; + error = -EROFS ; +if (MNT_IS_RDONLY (newnd.mnt)) + goto exit4; new_dentry =lookup_hash (&newnd.last, new_dir); error =PTR_ERR (new_dentry);if (IS_ERR (new_dentry))
fs/nfs/dir.c +2 -1
@@ -771,7 +771,8 @@ static int is_atomic_open(struct inode *if (nd->flags &LOOKUP_DIRECTORY )return 0 ;/* Are we trying to write to a read only partition? */ -if (IS_RDONLY (dir) && (nd->intent.open.flags & (O_CREAT |O_TRUNC |FMODE_WRITE ))) +if ((IS_RDONLY (dir) ||MNT_IS_RDONLY (nd->mnt)) && + (nd->intent.open.flags & (O_CREAT |O_TRUNC |FMODE_WRITE )))return 0 ;return 1 ; }
fs/nfsd/vfs.c +2 -1
@@ -1734,7 +1734,8 @@ nfsd_permission(struct svc_export *exp,*/ if (!(acc &MAY_LOCAL_ACCESS ))if (acc & (MAY_WRITE |MAY_SATTR |MAY_TRUNC )) { -if (EX_RDONLY (exp) ||IS_RDONLY (inode)) +if (EX_RDONLY (exp) ||IS_RDONLY (inode) + ||MNT_IS_RDONLY (exp->ex_mnt))return nfserr_rofs;if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE (inode))return nfserr_perm;
fs/open.c +7 -6
@@ -239,7 +239,7 @@ static inline long do_sys_truncate(const goto dput_and_out; error = -EROFS ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (nd.mnt)) goto dput_and_out; error = -EPERM ;
@@ -363,7 +363,7 @@ asmlinkage long sys_utime(char __user * inode = nd.dentry->d_inode; error = -EROFS ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (nd.mnt)) goto dput_and_out;/* Don't worry, the checks are done in inode_change_ok() */
@@ -420,7 +420,7 @@ long do_utimes(char __user * filename, s inode = nd.dentry->d_inode; error = -EROFS ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (nd.mnt)) goto dput_and_out;/* Don't worry, the checks are done in inode_change_ok() */
@@ -502,7 +502,8 @@ asmlinkage long sys_access(const char __if (!res) { res =permission (nd.dentry->d_inode, mode, &nd);/* SuS v2 requires we report a read only fs too */ -if (!res && (mode &S_IWOTH ) &&IS_RDONLY (nd.dentry->d_inode) +if (!res && (mode &S_IWOTH ) + && (IS_RDONLY (nd.dentry->d_inode) ||MNT_IS_RDONLY (nd.mnt)) && !special_file (nd.dentry->d_inode->i_mode)) res = -EROFS ;path_release (&nd);
@@ -608,7 +609,7 @@ asmlinkage long sys_fchmod(unsigned int inode = dentry->d_inode; err = -EROFS ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (file->f_vfsmnt)) goto out_putf; err = -EPERM ;if (IS_IMMUTABLE (inode) ||IS_APPEND (inode))
@@ -640,7 +641,7 @@ asmlinkage long sys_chmod(const char __u inode = nd.dentry->d_inode; error = -EROFS ; -if (IS_RDONLY (inode)) +if (IS_RDONLY (inode) ||MNT_IS_RDONLY (nd.mnt)) goto dput_and_out; error = -EPERM ;
fs/reiserfs/ioctl.c +4 -2
@@ -40,7 +40,8 @@ int reiserfs_ioctl (struct inode * inodei_attrs_to_sd_attrs ( inode, (__u16 * ) &flags );return put_user (flags, (int __user *) arg);case REISERFS_IOC_SETFLAGS : { -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 ))
@@ -72,7 +73,8 @@ int reiserfs_ioctl (struct inode * inodecase REISERFS_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 ;
fs/reiserfs/xattr.c +1 -1
@@ -1355,7 +1355,7 @@ __reiserfs_permission (struct inode *ino/* * Nobody gets write access to a read-only fs. */ -if (IS_RDONLY (inode) && +if ((IS_RDONLY (inode) || (nd &&MNT_IS_RDONLY (nd->mnt))) && (S_ISREG (mode) ||S_ISDIR (mode) ||S_ISLNK (mode)))return -EROFS ;