diff options
| author | James Morris <jmorris@namei.org> | 2011-06-15 01:41:48 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-15 01:41:48 +0200 |
| commit | 82b88bb24e28dd4fb4bec30e75412f41326130f0 (patch) | |
| tree | 61b1d0eb6ae6059e879571517a0f36bcffdabf34 /security/selinux/ss | |
| parent | x86 idle: APM requires pm_idle/default_idle unconditionally when a module (diff) | |
| parent | SELinux: skip file_name_trans_write() when policy downgraded. (diff) | |
| download | linux-82b88bb24e28dd4fb4bec30e75412f41326130f0.tar.xz linux-82b88bb24e28dd4fb4bec30e75412f41326130f0.zip | |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/policydb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 102e9ec1b77a..d246aca3f4fb 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -3222,6 +3222,9 @@ static int filename_trans_write(struct policydb *p, void *fp) __le32 buf[1]; int rc; + if (p->policyvers < POLICYDB_VERSION_FILENAME_TRANS) + return 0; + nel = 0; rc = hashtab_map(p->filename_trans, hashtab_cnt, &nel); if (rc) |