diff options
Diffstat (limited to 'security/selinux/ss/conditional.c')
-rw-r--r-- | security/selinux/ss/conditional.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index 50ad85d4b77c..a996cf1d378a 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c | |||
@@ -96,7 +96,7 @@ int evaluate_cond_node(struct policydb *p, struct cond_node *node) | |||
96 | if (new_state != node->cur_state) { | 96 | if (new_state != node->cur_state) { |
97 | node->cur_state = new_state; | 97 | node->cur_state = new_state; |
98 | if (new_state == -1) | 98 | if (new_state == -1) |
99 | printk(KERN_ERR "security: expression result was undefined - disabling all rules.\n"); | 99 | printk(KERN_ERR "SELinux: expression result was undefined - disabling all rules.\n"); |
100 | /* turn the rules on or off */ | 100 | /* turn the rules on or off */ |
101 | for (cur = node->true_list; cur != NULL; cur = cur->next) { | 101 | for (cur = node->true_list; cur != NULL; cur = cur->next) { |
102 | if (new_state <= 0) { | 102 | if (new_state <= 0) { |
@@ -276,7 +276,7 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum | |||
276 | */ | 276 | */ |
277 | if (k->specified & AVTAB_TYPE) { | 277 | if (k->specified & AVTAB_TYPE) { |
278 | if (avtab_search(&p->te_avtab, k)) { | 278 | if (avtab_search(&p->te_avtab, k)) { |
279 | printk("security: type rule already exists outside of a conditional."); | 279 | printk("SELinux: type rule already exists outside of a conditional."); |
280 | goto err; | 280 | goto err; |
281 | } | 281 | } |
282 | /* | 282 | /* |
@@ -291,7 +291,7 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum | |||
291 | node_ptr = avtab_search_node(&p->te_cond_avtab, k); | 291 | node_ptr = avtab_search_node(&p->te_cond_avtab, k); |
292 | if (node_ptr) { | 292 | if (node_ptr) { |
293 | if (avtab_search_node_next(node_ptr, k->specified)) { | 293 | if (avtab_search_node_next(node_ptr, k->specified)) { |
294 | printk("security: too many conflicting type rules."); | 294 | printk("SELinux: too many conflicting type rules."); |
295 | goto err; | 295 | goto err; |
296 | } | 296 | } |
297 | found = 0; | 297 | found = 0; |
@@ -302,13 +302,13 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum | |||
302 | } | 302 | } |
303 | } | 303 | } |
304 | if (!found) { | 304 | if (!found) { |
305 | printk("security: conflicting type rules.\n"); | 305 | printk("SELinux: conflicting type rules.\n"); |
306 | goto err; | 306 | goto err; |
307 | } | 307 | } |
308 | } | 308 | } |
309 | } else { | 309 | } else { |
310 | if (avtab_search(&p->te_cond_avtab, k)) { | 310 | if (avtab_search(&p->te_cond_avtab, k)) { |
311 | printk("security: conflicting type rules when adding type rule for true.\n"); | 311 | printk("SELinux: conflicting type rules when adding type rule for true.\n"); |
312 | goto err; | 312 | goto err; |
313 | } | 313 | } |
314 | } | 314 | } |
@@ -316,7 +316,7 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum | |||
316 | 316 | ||
317 | node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, k, d); | 317 | node_ptr = avtab_insert_nonunique(&p->te_cond_avtab, k, d); |
318 | if (!node_ptr) { | 318 | if (!node_ptr) { |
319 | printk("security: could not insert rule."); | 319 | printk("SELinux: could not insert rule."); |
320 | goto err; | 320 | goto err; |
321 | } | 321 | } |
322 | 322 | ||
@@ -376,12 +376,12 @@ static int cond_read_av_list(struct policydb *p, void *fp, struct cond_av_list * | |||
376 | static int expr_isvalid(struct policydb *p, struct cond_expr *expr) | 376 | static int expr_isvalid(struct policydb *p, struct cond_expr *expr) |
377 | { | 377 | { |
378 | if (expr->expr_type <= 0 || expr->expr_type > COND_LAST) { | 378 | if (expr->expr_type <= 0 || expr->expr_type > COND_LAST) { |
379 | printk("security: conditional expressions uses unknown operator.\n"); | 379 | printk("SELinux: conditional expressions uses unknown operator.\n"); |
380 | return 0; | 380 | return 0; |
381 | } | 381 | } |
382 | 382 | ||
383 | if (expr->bool > p->p_bools.nprim) { | 383 | if (expr->bool > p->p_bools.nprim) { |
384 | printk("security: conditional expressions uses unknown bool.\n"); | 384 | printk("SELinux: conditional expressions uses unknown bool.\n"); |
385 | return 0; | 385 | return 0; |
386 | } | 386 | } |
387 | return 1; | 387 | return 1; |