Linux 6.9-rc1

[linux-2.6-microblaze.git] / kernel / auditfilter.c

diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 42d9989..be8c680 100644 (file)
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -221,7 +221,7 @@ static int audit_match_signal(struct audit_entry *entry)
                                               entry->rule.mask));
        }
 
-       switch(audit_classify_arch(arch->val)) {
+       switch (audit_classify_arch(arch->val)) {
        case 0: /* native */
                return (audit_match_class_bits(AUDIT_CLASS_SIGNAL,
                                               entry->rule.mask));
@@ -243,7 +243,7 @@ static inline struct audit_entry *audit_to_entry_common(struct audit_rule_data *
 
        err = -EINVAL;
        listnr = rule->flags & ~AUDIT_FILTER_PREPEND;
-       switch(listnr) {
+       switch (listnr) {
        default:
                goto exit_err;
 #ifdef CONFIG_AUDITSYSCALL
@@ -344,7 +344,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f)
 
        switch (entry->rule.listnr) {
        case AUDIT_FILTER_FS:
-               switch(f->type) {
+               switch (f->type) {
                case AUDIT_FSTYPE:
                case AUDIT_FILTERKEY:
                        break;
@@ -651,7 +651,7 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule)
 
                data->fields[i] = f->type;
                data->fieldflags[i] = audit_ops[f->op];
-               switch(f->type) {
+               switch (f->type) {
                case AUDIT_SUBJ_USER:
                case AUDIT_SUBJ_ROLE:
                case AUDIT_SUBJ_TYPE:
@@ -694,7 +694,8 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule)
                        data->values[i] = f->val;
                }
        }
-       for (i = 0; i < AUDIT_BITMASK_SIZE; i++) data->mask[i] = krule->mask[i];
+       for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
+               data->mask[i] = krule->mask[i];
 
        return data;
 }
@@ -717,7 +718,7 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
                    a->fields[i].op != b->fields[i].op)
                        return 1;
 
-               switch(a->fields[i].type) {
+               switch (a->fields[i].type) {
                case AUDIT_SUBJ_USER:
                case AUDIT_SUBJ_ROLE:
                case AUDIT_SUBJ_TYPE:
@@ -787,7 +788,7 @@ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
 static inline int audit_dupe_lsm_field(struct audit_field *df,
                                           struct audit_field *sf)
 {
-       int ret = 0;
+       int ret;
        char *lsm_str;
 
        /* our own copy of lsm_str */
@@ -946,7 +947,7 @@ static inline int audit_add_rule(struct audit_entry *entry)
        int dont_count = 0;
 
        /* If any of these, don't count towards total */
-       switch(entry->rule.listnr) {
+       switch (entry->rule.listnr) {
        case AUDIT_FILTER_USER:
        case AUDIT_FILTER_EXCLUDE:
        case AUDIT_FILTER_FS:
@@ -1029,7 +1030,7 @@ int audit_del_rule(struct audit_entry *entry)
        int dont_count = 0;
 
        /* If any of these, don't count towards total */
-       switch(entry->rule.listnr) {
+       switch (entry->rule.listnr) {
        case AUDIT_FILTER_USER:
        case AUDIT_FILTER_EXCLUDE:
        case AUDIT_FILTER_FS:
@@ -1083,7 +1084,7 @@ static void audit_list_rules(int seq, struct sk_buff_head *q)
 
        /* This is a blocking read, so use audit_filter_mutex instead of rcu
         * iterator to sync with list writers. */
-       for (i=0; i<AUDIT_NR_FILTERS; i++) {
+       for (i = 0; i < AUDIT_NR_FILTERS; i++) {
                list_for_each_entry(r, &audit_rules_list[i], list) {
                        struct audit_rule_data *data;