Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/jmorris/security-testing-2.6 * 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: SELinux: /proc/mounts should show what it can
mariux64 · Aug 1, 2008 · a7c2a10 · a7c2a10
2 parents b14f7fb + 383795c
commit a7c2a10
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
@@ -998,8 +998,12 @@ static int selinux_sb_show_options(struct seq_file *m, struct super_block *sb)
 	int rc;
 
 	rc = selinux_get_mnt_opts(sb, &opts);
-	if (rc)
+	if (rc) {
+		/* before policy load we may get EINVAL, don't show anything */
+		if (rc == -EINVAL)
+			rc = 0;
 		return rc;
+	}
 
 	selinux_write_opts(m, &opts);