Audit: Final renamings and cleanup

Rename the se_str and se_rule audit fields elements to
lsm_str and lsm_rule to avoid confusion.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Acked-by: James Morris <jmorris@namei.org>

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,
                            match for now to avoid losing information that
                            may be wanted.   An error message will also be
                            logged upon error */
-                        if (f->se_rule) {
+                        if (f->lsm_rule) {
                                 if (need_sid) {
                                         security_task_getsecid(tsk, &sid);
                                         need_sid = 0;
                                 }
                                 result = security_audit_rule_match(sid, f->type,
                                                                   f->op,
-                                                                  f->se_rule,
+                                                                  f->lsm_rule,
                                                                   ctx);
                         }
                         break;
@@ -545,18 +545,18 @@ static int audit_filter_rules(struct task_struct *tsk,
                 case AUDIT_OBJ_LEV_HIGH:
                         /* The above note for AUDIT_SUBJ_USER...AUDIT_SUBJ_CLR
                            also applies here */
-                        if (f->se_rule) {
+                        if (f->lsm_rule) {
                                 /* Find files that match */
                                 if (name) {
                                         result = security_audit_rule_match(
                                                    name->osid, f->type, f->op,
-                                                   f->se_rule, ctx);
+                                                   f->lsm_rule, ctx);
                                 } else if (ctx) {
                                         for (j = 0; j < ctx->name_count; j++) {
                                                 if (security_audit_rule_match(
                                                       ctx->names[j].osid,
                                                       f->type, f->op,
-                                                      f->se_rule, ctx)) {
+                                                      f->lsm_rule, ctx)) {
                                                         ++result;
                                                         break;
                                                 }
@@ -569,7 +569,7 @@ static int audit_filter_rules(struct task_struct *tsk,
                                              aux = aux->next) {
                                                 if (aux->type == AUDIT_IPC) {
                                                         struct audit_aux_data_ipcctl *axi = (void *)aux;
-                                                        if (security_audit_rule_match(axi->osid, f->type, f->op, f->se_rule, ctx)) {
+                                                        if (security_audit_rule_match(axi->osid, f->type, f->op, f->lsm_rule, ctx)) {
                                                                 ++result;
                                                                 break;
                                                         }