diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /security/selinux/ss/policydb.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index be9de387283..57363562f0f 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c | |||
| @@ -501,8 +501,8 @@ static int policydb_index(struct policydb *p) | |||
| 501 | if (rc) | 501 | if (rc) |
| 502 | goto out; | 502 | goto out; |
| 503 | 503 | ||
| 504 | rc = -ENOMEM; | 504 | rc = cond_init_bool_indexes(p); |
| 505 | if (cond_init_bool_indexes(p)) | 505 | if (rc) |
| 506 | goto out; | 506 | goto out; |
| 507 | 507 | ||
| 508 | for (i = 0; i < SYM_NUM; i++) { | 508 | for (i = 0; i < SYM_NUM; i++) { |