diff options
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index c0700535e5c5..56e56ed594a8 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -527,14 +527,14 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
527 | match for now to avoid losing information that | 527 | match for now to avoid losing information that |
528 | may be wanted. An error message will also be | 528 | may be wanted. An error message will also be |
529 | logged upon error */ | 529 | logged upon error */ |
530 | if (f->se_rule) { | 530 | if (f->lsm_rule) { |
531 | if (need_sid) { | 531 | if (need_sid) { |
532 | security_task_getsecid(tsk, &sid); | 532 | security_task_getsecid(tsk, &sid); |
533 | need_sid = 0; | 533 | need_sid = 0; |
534 | } | 534 | } |
535 | result = security_audit_rule_match(sid, f->type, | 535 | result = security_audit_rule_match(sid, f->type, |
536 | f->op, | 536 | f->op, |
537 | f->se_rule, | 537 | f->lsm_rule, |
538 | ctx); | 538 | ctx); |
539 | } | 539 | } |
540 | break; | 540 | break; |
@@ -545,18 +545,18 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
545 | case AUDIT_OBJ_LEV_HIGH: | 545 | case AUDIT_OBJ_LEV_HIGH: |
546 | /* The above note for AUDIT_SUBJ_USER...AUDIT_SUBJ_CLR | 546 | /* The above note for AUDIT_SUBJ_USER...AUDIT_SUBJ_CLR |
547 | also applies here */ | 547 | also applies here */ |
548 | if (f->se_rule) { | 548 | if (f->lsm_rule) { |
549 | /* Find files that match */ | 549 | /* Find files that match */ |
550 | if (name) { | 550 | if (name) { |
551 | result = security_audit_rule_match( | 551 | result = security_audit_rule_match( |
552 | name->osid, f->type, f->op, | 552 | name->osid, f->type, f->op, |
553 | f->se_rule, ctx); | 553 | f->lsm_rule, ctx); |
554 | } else if (ctx) { | 554 | } else if (ctx) { |
555 | for (j = 0; j < ctx->name_count; j++) { | 555 | for (j = 0; j < ctx->name_count; j++) { |
556 | if (security_audit_rule_match( | 556 | if (security_audit_rule_match( |
557 | ctx->names[j].osid, | 557 | ctx->names[j].osid, |
558 | f->type, f->op, | 558 | f->type, f->op, |
559 | f->se_rule, ctx)) { | 559 | f->lsm_rule, ctx)) { |
560 | ++result; | 560 | ++result; |
561 | break; | 561 | break; |
562 | } | 562 | } |
@@ -569,7 +569,7 @@ static int audit_filter_rules(struct task_struct *tsk, | |||
569 | aux = aux->next) { | 569 | aux = aux->next) { |
570 | if (aux->type == AUDIT_IPC) { | 570 | if (aux->type == AUDIT_IPC) { |
571 | struct audit_aux_data_ipcctl *axi = (void *)aux; | 571 | struct audit_aux_data_ipcctl *axi = (void *)aux; |
572 | if (security_audit_rule_match(axi->osid, f->type, f->op, f->se_rule, ctx)) { | 572 | if (security_audit_rule_match(axi->osid, f->type, f->op, f->lsm_rule, ctx)) { |
573 | ++result; | 573 | ++result; |
574 | break; | 574 | break; |
575 | } | 575 | } |