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
This commit is contained in:
commit
a7c2a10dab
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue