The patch titled
reiserfs: fix oops while creating privroot with selinux enabled
has been added to the -mm tree. Its filename is
reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: reiserfs: fix oops while creating privroot with selinux enabled
From: Jeff Mahoney <jeffm@xxxxxxxx>
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@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/reiserfs/xattr_security.c | 2 +-
include/linux/reiserfs_xattr.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff -puN fs/reiserfs/xattr_security.c~reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled fs/reiserfs/xattr_security.c
--- a/fs/reiserfs/xattr_security.c~reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled
+++ a/fs/reiserfs/xattr_security.c
@@ -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
diff -puN include/linux/reiserfs_xattr.h~reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled include/linux/reiserfs_xattr.h
--- a/include/linux/reiserfs_xattr.h~reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled
+++ a/include/linux/reiserfs_xattr.h
@@ -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)
{
_
Patches currently in -mm which might be from jeffm@xxxxxxxx are
reiserfs-fix-oops-while-creating-privroot-with-selinux-enabled.patch
reiserfs-properly-honor-read-only-devices.patch
delayacct-align-to-8-byte-boundary-on-64-bit-systems.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
