Commit a7c2a10d authored Aug 01, 2008 by Linus Torvalds

Merge branch 'hotfixes' of...

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

parents b14f7fb5 383795c2

security/selinux/hooks.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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);