Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus

2011-06-15 09:41:48 +10:00
parent 60b8b1de0d ded509880f
commit 82b88bb24e
2 changed files with 39 additions and 1 deletions
--- 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)