Bind Mount Extensions 0.06
PATCH 5/6 Bind Mount Extensions 0.06
;
; Bind Mount Extensions
;
; This part propagates the vfsmount into both setxattr() and ; removexattr() to allow for vfsmount based checks there, and ; verifies that the vfsmount isn't RDONLY
;
; Copyright (C) 2003-2005 Herbert Pötzl <[email protected]> ;
; Changelog:
;
; 0.01 - broken out part from bme0.05
;
; 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.
;
fs/xattr.c +14 -8
@@ -23,7 +23,7 @@*/ static long setxattr (struct dentry *d,char __user *name,void __user *value, -size_t size,int flags) +size_t size,int flags,struct vfsmount *mnt) {int error;void *kvalue =NULL ;
@@ -56,6 +56,9 @@ setxattr(struct dentry *d, char __user * error =security_inode_setxattr (d, kname, kvalue, size, flags);if (error) goto out; + error = -EROFS ; +if (MNT_IS_RDONLY (mnt)) + goto out; error = d->d_inode->i_op->setxattr (d, kname, kvalue, size, flags);if (!error)security_inode_post_setxattr (d, kname, kvalue, size, flags);
@@ -77,7 +80,7 @@ sys_setxattr(char __user *path, char __u error =user_path_walk (path, &nd);if (error)return error; - error =setxattr (nd.dentry, name, value, size, flags); + error =setxattr (nd.dentry, name, value, size, flags, nd.mnt);path_release (&nd);return error; }
@@ -92,7 +95,7 @@ sys_lsetxattr(char __user *path, char __ error =user_path_walk_link (path, &nd);if (error)return error; - error =setxattr (nd.dentry, name, value, size, flags); + error =setxattr (nd.dentry, name, value, size, flags, nd.mnt);path_release (&nd);return error; }
@@ -107,7 +110,7 @@ sys_fsetxattr(int fd, char __user *name, f =fget (fd);if (!f)return error; - error =setxattr (f->f_dentry, name, value, size, flags); + error =setxattr (f->f_dentry, name, value, size, flags, f->f_vfsmnt);fput (f);return error; }
@@ -285,7 +288,7 @@ sys_flistxattr(int fd, char __user *list* Extended attribute REMOVE operations */ static long -removexattr (struct dentry *d,char __user *name) +removexattr (struct dentry *d,char __user *name,struct vfsmount *mnt) {int error;char kname[XATTR_NAME_MAX +1 ];
@@ -301,6 +304,9 @@ removexattr(struct dentry *d, char __use error =security_inode_removexattr (d, kname);if (error) goto out; + error = -EROFS ; +if (MNT_IS_RDONLY (mnt)) + goto out;down (&d->d_inode->i_sem); error = d->d_inode->i_op->removexattr (d, kname);up (&d->d_inode->i_sem);
@@ -318,7 +324,7 @@ sys_removexattr(char __user *path, char error =user_path_walk (path, &nd);if (error)return error; - error =removexattr (nd.dentry, name); + error =removexattr (nd.dentry, name, nd.mnt);path_release (&nd);return error; }
@@ -332,7 +338,7 @@ sys_lremovexattr(char __user *path, char error =user_path_walk_link (path, &nd);if (error)return error; - error =removexattr (nd.dentry, name); + error =removexattr (nd.dentry, name, nd.mnt);path_release (&nd);return error; }
@@ -346,7 +352,7 @@ sys_fremovexattr(int fd, char __user *na f =fget (fd);if (!f)return error; - error =removexattr (f->f_dentry, name); + error =removexattr (f->f_dentry, name, f->f_vfsmnt);fput (f);return error; }