diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-27 07:43:56 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-27 07:43:56 +0100 |
commit | 69e4d4c3e1cb23fce81deeae08b502d27bad6993 (patch) | |
tree | 18a9bb34e46027efbb8c0a6c149335c66f9b9012 | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
parent | selinux: fix labeling of /proc/net inodes (diff) | |
download | linux-69e4d4c3e1cb23fce81deeae08b502d27bad6993.tar.xz linux-69e4d4c3e1cb23fce81deeae08b502d27bad6993.zip |
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: fix labeling of /proc/net inodes
-rw-r--r-- | security/selinux/ss/services.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index f83b19daed16..4bf715d4cf29 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1744,6 +1744,9 @@ int security_genfs_sid(const char *fstype, struct ocontext *c; int rc = 0, cmp = 0; + while (path[0] == '/' && path[1] == '/') + path++; + POLICY_RDLOCK; for (genfs = policydb.genfs; genfs; genfs = genfs->next) { |