diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:55:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:55:57 -0700 |
| commit | a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287 (patch) | |
| tree | f031a4ae113e7669b56eb399c2e6f5285d2418f5 | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| parent | SELinux: /proc/mounts should show what it can (diff) | |
| download | linux-dev-a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287.tar.xz linux-dev-a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287.zip | |
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
| -rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 40d06c533f89..3ae9bec5a508 100644 --- 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); |