diff options
| author | James Morris <jmorris@namei.org> | 2008-10-10 11:09:47 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-10 11:09:47 +1100 |
| commit | 9ac684fc38cf17fbd25c0c9e388713c5ddfa3b14 (patch) | |
| tree | f2715b294d64efe1c5788f4fa5f0b25cdff071a7 /security/selinux/ss/ebitmap.c | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| parent | 81990fbdd18b9cfdc93dc221ff3250f81468aed8 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/ebitmap.c')
| -rw-r--r-- | security/selinux/ss/ebitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c index ddc275490af..68c7348d1ac 100644 --- a/security/selinux/ss/ebitmap.c +++ b/security/selinux/ss/ebitmap.c @@ -109,7 +109,7 @@ int ebitmap_netlbl_export(struct ebitmap *ebmap, *catmap = c_iter; c_iter->startbit = e_iter->startbit & ~(NETLBL_CATMAP_SIZE - 1); - while (e_iter != NULL) { + while (e_iter) { for (i = 0; i < EBITMAP_UNIT_NUMS; i++) { unsigned int delta, e_startbit, c_endbit; @@ -197,7 +197,7 @@ int ebitmap_netlbl_import(struct ebitmap *ebmap, } } c_iter = c_iter->next; - } while (c_iter != NULL); + } while (c_iter); if (e_iter != NULL) ebmap->highbit = e_iter->startbit + EBITMAP_SIZE; else |