diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2010-03-23 13:35:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:31:21 -0700 |
| commit | 6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f (patch) | |
| tree | 9049d01ae8eee4ce948d5a63005c1baf0ceac5a4 /fs/reiserfs/xattr_security.c | |
| parent | 298359c5bf06c04258d7cf552426e198c47e83c1 (diff) | |
| download | kernel_goldelico_gta04-6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f.zip kernel_goldelico_gta04-6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f.tar.gz kernel_goldelico_gta04-6cb4aff0a77cc0e6bae9475d62205319e3ebbf3f.tar.bz2 | |
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 'fs/reiserfs/xattr_security.c')
| -rw-r--r-- | fs/reiserfs/xattr_security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c index d8b5bfc..de1fcff 100644 --- a/fs/reiserfs/xattr_security.c +++ b/fs/reiserfs/xattr_security.c @@ -76,7 +76,7 @@ int reiserfs_security_init(struct inode *dir, struct inode *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 |