diff options
Diffstat (limited to 'security/selinux/ss/sidtab.c')
| -rw-r--r-- | security/selinux/ss/sidtab.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/security/selinux/ss/sidtab.c b/security/selinux/ss/sidtab.c index a81ded104129..e817989764cd 100644 --- a/security/selinux/ss/sidtab.c +++ b/security/selinux/ss/sidtab.c | |||
| @@ -43,7 +43,7 @@ int sidtab_insert(struct sidtab *s, u32 sid, struct context *context) | |||
| 43 | hvalue = SIDTAB_HASH(sid); | 43 | hvalue = SIDTAB_HASH(sid); |
| 44 | prev = NULL; | 44 | prev = NULL; |
| 45 | cur = s->htable[hvalue]; | 45 | cur = s->htable[hvalue]; |
| 46 | while (cur != NULL && sid > cur->sid) { | 46 | while (cur && sid > cur->sid) { |
| 47 | prev = cur; | 47 | prev = cur; |
| 48 | cur = cur->next; | 48 | cur = cur->next; |
| 49 | } | 49 | } |
| @@ -92,7 +92,7 @@ static struct context *sidtab_search_core(struct sidtab *s, u32 sid, int force) | |||
| 92 | 92 | ||
| 93 | hvalue = SIDTAB_HASH(sid); | 93 | hvalue = SIDTAB_HASH(sid); |
| 94 | cur = s->htable[hvalue]; | 94 | cur = s->htable[hvalue]; |
| 95 | while (cur != NULL && sid > cur->sid) | 95 | while (cur && sid > cur->sid) |
| 96 | cur = cur->next; | 96 | cur = cur->next; |
| 97 | 97 | ||
| 98 | if (force && cur && sid == cur->sid && cur->context.len) | 98 | if (force && cur && sid == cur->sid && cur->context.len) |
| @@ -103,7 +103,7 @@ static struct context *sidtab_search_core(struct sidtab *s, u32 sid, int force) | |||
| 103 | sid = SECINITSID_UNLABELED; | 103 | sid = SECINITSID_UNLABELED; |
| 104 | hvalue = SIDTAB_HASH(sid); | 104 | hvalue = SIDTAB_HASH(sid); |
| 105 | cur = s->htable[hvalue]; | 105 | cur = s->htable[hvalue]; |
| 106 | while (cur != NULL && sid > cur->sid) | 106 | while (cur && sid > cur->sid) |
| 107 | cur = cur->next; | 107 | cur = cur->next; |
| 108 | if (!cur || sid != cur->sid) | 108 | if (!cur || sid != cur->sid) |
| 109 | return NULL; | 109 | return NULL; |
| @@ -136,7 +136,7 @@ int sidtab_map(struct sidtab *s, | |||
| 136 | 136 | ||
| 137 | for (i = 0; i < SIDTAB_SIZE; i++) { | 137 | for (i = 0; i < SIDTAB_SIZE; i++) { |
| 138 | cur = s->htable[i]; | 138 | cur = s->htable[i]; |
| 139 | while (cur != NULL) { | 139 | while (cur) { |
| 140 | rc = apply(cur->sid, &cur->context, args); | 140 | rc = apply(cur->sid, &cur->context, args); |
| 141 | if (rc) | 141 | if (rc) |
| 142 | goto out; | 142 | goto out; |
| @@ -155,7 +155,7 @@ static inline u32 sidtab_search_context(struct sidtab *s, | |||
| 155 | 155 | ||
| 156 | for (i = 0; i < SIDTAB_SIZE; i++) { | 156 | for (i = 0; i < SIDTAB_SIZE; i++) { |
| 157 | cur = s->htable[i]; | 157 | cur = s->htable[i]; |
| 158 | while (cur != NULL) { | 158 | while (cur) { |
| 159 | if (context_cmp(&cur->context, context)) | 159 | if (context_cmp(&cur->context, context)) |
| 160 | return cur->sid; | 160 | return cur->sid; |
| 161 | cur = cur->next; | 161 | cur = cur->next; |
| @@ -242,7 +242,7 @@ void sidtab_destroy(struct sidtab *s) | |||
| 242 | 242 | ||
| 243 | for (i = 0; i < SIDTAB_SIZE; i++) { | 243 | for (i = 0; i < SIDTAB_SIZE; i++) { |
| 244 | cur = s->htable[i]; | 244 | cur = s->htable[i]; |
| 245 | while (cur != NULL) { | 245 | while (cur) { |
| 246 | temp = cur; | 246 | temp = cur; |
| 247 | cur = cur->next; | 247 | cur = cur->next; |
| 248 | context_destroy(&temp->context); | 248 | context_destroy(&temp->context); |
