3 files changed, 13 insertions, 15 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 5b9ad3dda885..f4799eb6977a 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -813,21 +813,21 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         case AUDIT_MAKE_EQUIV: {
                 void *bufp = data;
                 u32 sizes[2];
-                size_t len = nlmsg_len(nlh);
+                size_t msglen = nlmsg_len(nlh);
                 char *old, *new;
 
                 err = -EINVAL;
-                if (len < 2 * sizeof(u32))
+                if (msglen < 2 * sizeof(u32))
                         break;
                 memcpy(sizes, bufp, 2 * sizeof(u32));
                 bufp += 2 * sizeof(u32);
-                len -= 2 * sizeof(u32);
-                old = audit_unpack_string(&bufp, &len, sizes[0]);
+                msglen -= 2 * sizeof(u32);
+                old = audit_unpack_string(&bufp, &msglen, sizes[0]);
                 if (IS_ERR(old)) {
                         err = PTR_ERR(old);
                         break;
                 }
-                new = audit_unpack_string(&bufp, &len, sizes[1]);
+                new = audit_unpack_string(&bufp, &msglen, sizes[1]);
                 if (IS_ERR(new)) {
                         err = PTR_ERR(new);
                         kfree(old);
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index bcf1fb7c7f32..7c3450d063fe 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -417,7 +417,7 @@ exit_err:
 static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
 {
         struct audit_entry *entry;
-        struct audit_field *f;
+        struct audit_field *ino_f;
         int err = 0;
         int i;
 
@@ -499,9 +499,9 @@ static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
                 }
         }
 
-        f = entry->rule.inode_f;
-        if (f) {
-                switch(f->op) {
+        ino_f = entry->rule.inode_f;
+        if (ino_f) {
+                switch(ino_f->op) {
                 case AUDIT_NOT_EQUAL:
                         entry->rule.inode_f = NULL;
                 case AUDIT_EQUAL:
@@ -526,7 +526,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
 {
         int err = 0;
         struct audit_entry *entry;
-        struct audit_field *f;
+        struct audit_field *ino_f;
         void *bufp;
         size_t remain = datasz - sizeof(struct audit_rule_data);
         int i;
@@ -654,9 +654,9 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
                 }
         }
 
-        f = entry->rule.inode_f;
-        if (f) {
-                switch(f->op) {
+        ino_f = entry->rule.inode_f;
+        if (ino_f) {
+                switch(ino_f->op) {
                 case AUDIT_NOT_EQUAL:
                         entry->rule.inode_f = NULL;
                 case AUDIT_EQUAL:
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index e128adcb33c2..091409996577 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1293,7 +1293,6 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
                         break; }
 
                 case AUDIT_SOCKETCALL: {
-                        int i;
                         struct audit_aux_data_socketcall *axs = (void *)aux;
                         audit_log_format(ab, "nargs=%d", axs->nargs);
                         for (i=0; i<axs->nargs; i++)
@@ -1318,7 +1317,6 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
 
         for (aux = context->aux_pids; aux; aux = aux->next) {
                 struct audit_aux_data_pids *axs = (void *)aux;
-                int i;
 
                 for (i = 0; i < axs->pid_count; i++)
                         if (audit_log_pid_context(context, axs->target_pid[i],