diff options
author | James Morris <jmorris@namei.org> | 2011-06-14 19:41:48 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-06-14 19:41:48 -0400 |
commit | 82b88bb24e28dd4fb4bec30e75412f41326130f0 (patch) | |
tree | 61b1d0eb6ae6059e879571517a0f36bcffdabf34 /security/selinux/ss | |
parent | 60b8b1de0dd2bf246f0e074d287bb3f0bc42a755 (diff) | |
parent | ded509880f6a0213b09f8ae7bef84acb16eaccbf (diff) |
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) | |||
3222 | __le32 buf[1]; | 3222 | __le32 buf[1]; |
3223 | int rc; | 3223 | int rc; |
3224 | 3224 | ||
3225 | if (p->policyvers < POLICYDB_VERSION_FILENAME_TRANS) | ||
3226 | return 0; | ||
3227 | |||
3225 | nel = 0; | 3228 | nel = 0; |
3226 | rc = hashtab_map(p->filename_trans, hashtab_cnt, &nel); | 3229 | rc = hashtab_map(p->filename_trans, hashtab_cnt, &nel); |
3227 | if (rc) | 3230 | if (rc) |