rpms/kernel/F-9 linux-2.6-selinux-ssinitialized-bugon.patch, 1.1, 1.2

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19432

Modified Files:
	linux-2.6-selinux-ssinitialized-bugon.patch 
Log Message:
replace with official patch


linux-2.6-selinux-ssinitialized-bugon.patch:

Index: linux-2.6-selinux-ssinitialized-bugon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-selinux-ssinitialized-bugon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-selinux-ssinitialized-bugon.patch	22 Apr 2008 15:33:04 -0000	1.1
+++ linux-2.6-selinux-ssinitialized-bugon.patch	22 May 2008 00:48:15 -0000	1.2
@@ -1,8 +1,24 @@
- security/selinux/hooks.c |   15 ++++++++++++---
- 1 files changed, 12 insertions(+), 3 deletions(-)
+From: Eric Paris <eparis at redhat.com>
+Date: Mon, 21 Apr 2008 20:24:11 +0000 (-0400)
+Subject: SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts
+X-Git-Tag: v2.6.26-rc1~1103^2~1
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0f5e64200f20fc8f5b759c4010082f577ab0af3f
+
+SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts
+
+The Fedora installer actually makes multiple NFS mounts before it loads
+selinux policy.  The code in selinux_clone_mnt_opts() assumed that the
+init process would always be loading policy before NFS was up and
+running.  It might be possible to hit this in a diskless environment as
+well, I'm not sure.  There is no need to BUG_ON() in this situation
+since we can safely continue given the circumstances.
+
+Signed-off-by: Eric Paris <eparis at redhat.com>
+Signed-off-by: James Morris <jmorris at namei.org>
+---
 
 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index f9927f0..92c8910 100644
+index 1bf2543..33af321 100644
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
 @@ -755,9 +755,18 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,