diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-21 15:02:57 -0400 |
| commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
| tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /security/selinux/ss/policydb.c | |
| parent | a18711120764dd96ed2ee6a4d436c448542bad77 (diff) | |
| parent | e92d03bff9a0d0bcbb812c9b1290ca96c9338d45 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -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) |