diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-10 01:36:12 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-10 01:36:12 (GMT) |
| commit | 44cad261025c04327fd7e847a7088fd3031b0c3e (patch) | |
| tree | db43205d37c4ce5af8fa7980564e9baa7c72426b | |
| parent | c5b9004baac077fb472cc7ac8293f2a9fc918d22 (diff) | |
| parent | 5a55261716e838f188598ab3d7a0abf9cf1338f8 (diff) | |
| download | linux-44cad261025c04327fd7e847a7088fd3031b0c3e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: don't BUG if fs reuses a superblock
| -rw-r--r-- | security/selinux/hooks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 89bb6d3..d39b59c 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -760,13 +760,13 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb, * this early in the boot process. */ BUG_ON(!ss_initialized); - /* this might go away sometime down the line if there is a new user - * of clone, but for now, nfs better not get here... */ - BUG_ON(newsbsec->initialized); - /* how can we clone if the old one wasn't set up?? */ BUG_ON(!oldsbsec->initialized); + /* if fs is reusing a sb, just let its options stand... */ + if (newsbsec->initialized) + return; + mutex_lock(&newsbsec->lock); newsbsec->flags = oldsbsec->flags; |