On Tuesday 06 February 2007 04:55, Stephen Smalley wrote:
> On Mon, 2007-02-05 at 18:13 -0800, Andreas Gruenbacher wrote:
> > Reiserfs should probably just mark all its xattr inodes as private in
> > order to play nicely with other lsms. As far as pathname based lsms are
> > concerned, pathnames to those fs-internal objects are meaningless though,
> > and so we pass NULL here.
>
> That should be handled by the current marking of reiserfs xattr inodes
> with S_PRIVATE and the tests for IS_PRIVATE in include/linux/security.h
> (and in one instance, within SELinux itself).
Reiserfs currently only marks the ".reiserfs_priv" directory as private, but
not the files below it -- how about the attached patch to fix that?
Andreas
Fix reiserfs xattrs for selinux
Mark all inodes used for reiserfs xattrs as private so that selinux
(or any other LSM) will not try to mediate access to the files and
directories used as the xattr backing store. The xattr operations
are already protected through the xattr LSM hooks.
There is no real reason for having reiserfs_mark_inode_private --
remove it and directly mark the inodes as private.
Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxx>
Index: b/fs/reiserfs/xattr.c
===================================================================
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -79,6 +79,7 @@ static struct dentry *create_xa_root(str
dput(privroot);
return ERR_PTR(err);
}
+ xaroot->d_inode->i_flags |= S_PRIVATE;
REISERFS_SB(sb)->xattr_root = dget(xaroot);
}
@@ -108,6 +109,7 @@ static struct dentry *__get_xa_root(stru
goto out;
}
+ xaroot->d_inode->i_flags |= S_PRIVATE;
REISERFS_SB(s)->xattr_root = dget(xaroot);
out:
@@ -183,6 +185,7 @@ static struct dentry *open_xa_dir(const
return ERR_PTR(-ENODATA);
}
}
+ xadir->d_inode->i_flags |= S_PRIVATE;
dput(xaroot);
return xadir;
@@ -235,6 +238,8 @@ static struct dentry *get_xa_file_dentry
dput(xadir);
if (err)
xafile = ERR_PTR(err);
+ else
+ xafile->d_inode->i_flags |= S_PRIVATE;
return xafile;
}
@@ -715,6 +720,7 @@ __reiserfs_xattr_del(struct dentry *xadi
err = -ENODATA;
goto out_file;
}
+ dentry->d_inode->i_flags |= S_PRIVATE;
/* Skip directories.. */
if (S_ISDIR(dentry->d_inode->i_mode))
@@ -865,6 +871,7 @@ reiserfs_chown_xattrs_filler(void *buf,
dput(xafile);
return -ENODATA;
}
+ xafile->d_inode->i_flags |= S_PRIVATE;
if (!S_ISDIR(xafile->d_inode->i_mode))
err = notify_change(xafile, NULL, attrs);
@@ -1289,7 +1296,7 @@ int reiserfs_xattr_init(struct super_blo
if (!err && dentry) {
s->s_root->d_op = &xattr_lookup_poison_ops;
- reiserfs_mark_inode_private(dentry->d_inode);
+ dentry->d_inode->i_flags |= S_PRIVATE;
REISERFS_SB(s)->priv_root = dentry;
} else if (!(mount_flags & MS_RDONLY)) { /* xattrs are unavailable */
/* If we're read-only it just means that the dir hasn't been
Index: b/include/linux/reiserfs_xattr.h
===================================================================
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -92,11 +92,6 @@ static inline void reiserfs_read_unlock_
up_read(&REISERFS_I(inode)->xattr_sem);
}
-static inline void reiserfs_mark_inode_private(struct inode *inode)
-{
- inode->i_flags |= S_PRIVATE;
-}
-
static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
{
init_rwsem(&REISERFS_I(inode)->xattr_sem);
@@ -105,7 +100,6 @@ static inline void reiserfs_init_xattr_r
#else
#define is_reiserfs_priv_object(inode) 0
-#define reiserfs_mark_inode_private(inode) do {;} while(0)
#define reiserfs_getxattr NULL
#define reiserfs_setxattr NULL
#define reiserfs_listxattr NULL
Index: b/fs/reiserfs/xattr_acl.c
===================================================================
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -336,7 +336,7 @@ reiserfs_inherit_default_acl(struct inod
* would be useless since permissions are ignored, and a pain because
* it introduces locking cycles */
if (is_reiserfs_priv_object(dir)) {
- reiserfs_mark_inode_private(inode);
+ inode->i_flags |= S_PRIVATE;
goto apply_umask;
}
