mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 08:35:19 -05:00
Code Activity

reiserfs: fix oops while creating privroot with selinux enabled

Browse source 
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>
This commit is contained in:
Jeff Mahoney 2010-03-23 13:35:38 -07:00 • committed by Linus Torvalds
parent 298359c5bf
commit 6cb4aff0a7
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/reiserfs/xattr_security.c
View file

@ -76,7 +76,7 @@ int reiserfs_security_init(struct inode *dir, struct inode *inode,
return error; return error;
} }
if (sec->length) { if (sec->length && reiserfs_xattrs_initialized(inode->i_sb)) {
blocks = reiserfs_xattr_jcreate_nblocks(inode) + blocks = reiserfs_xattr_jcreate_nblocks(inode) +
reiserfs_xattr_nblocks(inode, sec->length); reiserfs_xattr_nblocks(inode, sec->length);
/* We don't want to count the directories twice if we have /* We don't want to count the directories twice if we have

5
include/linux/reiserfs_xattr.h
View file

@ -70,6 +70,11 @@ int reiserfs_security_write(struct reiserfs_transaction_handle *th,
void reiserfs_security_free(struct reiserfs_security_handle *sec); void reiserfs_security_free(struct reiserfs_security_handle *sec);
#endif #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)) #define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header))
static inline loff_t reiserfs_xattr_nblocks(struct inode *inode, loff_t size) static inline loff_t reiserfs_xattr_nblocks(struct inode *inode, loff_t size)
{ {