Skip to contentSkip to conversation

reiserfs: fix oops while creating privroot with selinux enabled

PATCH New Jeff Mahoney 1 participant 1 message Mar 17, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 reiserfs: fix oops while creating privroot with selinux enabled

Commit 57fe60df 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.

This fixes http://bugzilla.kernel.org/show_bug.cgi?id=15309

---
 fs/reiserfs/xattr_security.c   |    2 +-
 include/linux/reiserfs_xattr.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
fs/reiserfs/xattr_security.c +1 -1
@@ -76,7 +76,7 @@ int reiserfs_security_init(struct inode
 		return error;
 	}
 
-	if (sec->length) {
+	if (sec->length && reiserfs_xattrs_initialized(inode->i_sb)) {
 		blocks = reiserfs_xattr_jcreate_nblocks(inode) +
 			 reiserfs_xattr_nblocks(inode, sec->length);
 		/* We don't want to count the directories twice if we have
include/linux/reiserfs_xattr.h +5 -0
@@ -70,6 +70,11 @@ int reiserfs_security_write(struct reise
 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)
 {
Signature · 2 lines
Jeff Mahoney
SUSE Labs