summaryrefslogtreecommitdiff
path: root/include/linux/reiserfs_xattr.h
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2010-03-23 23:35:38 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-25 02:31:21 +0300
commit6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f (patch)
tree9049d01ae8eee4ce948d5a63005c1baf0ceac5a4 /include/linux/reiserfs_xattr.h
parent298359c5bf06c04258d7cf552426e198c47e83c1 (diff)
downloadlinux-6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f.tar.xz
reiserfs: fix oops while creating privroot with selinux enabled
Commit 57fe60df ("reiserfs: add atomic addition of selinux attributes during inode creation") contains a bug that will cause it to oops when mounting a file system that didn't previously contain extended attributes on a system using security.* xattrs. The issue is that while creating the privroot during mount reiserfs_security_init calls reiserfs_xattr_jcreate_nblocks which dereferences the xattr root. The xattr root doesn't exist, so we get an oops. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15309 Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/reiserfs_xattr.h')
-rw-r--r--include/linux/reiserfs_xattr.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index 99928dce37ea..7fa02b4af838 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -70,6 +70,11 @@ int reiserfs_security_write(struct reiserfs_transaction_handle *th,
void reiserfs_security_free(struct reiserfs_security_handle *sec);
#endif
+static inline int reiserfs_xattrs_initialized(struct super_block *sb)
+{
+ return REISERFS_SB(sb)->priv_root != NULL;
+}
+
#define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header))
static inline loff_t reiserfs_xattr_nblocks(struct inode *inode, loff_t size)
{