Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7719e437fac119e57b17588bab3a8e39ff9d22eb

Authored by Harvey Harrison
Committed by Al Viro
1 parent c782f242f0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH 2/2] audit: fix sparse shadowed variable warnings 

Use msglen as the identifier.
kernel/audit.c:724:10: warning: symbol 'len' shadows an earlier one
kernel/audit.c:575:8: originally declared here

Don't use ino_f to check the inode field at the end of the functions.
kernel/auditfilter.c:429:22: warning: symbol 'f' shadows an earlier one
kernel/auditfilter.c:420:21: originally declared here
kernel/auditfilter.c:542:22: warning: symbol 'f' shadows an earlier one
kernel/auditfilter.c:529:21: originally declared here

i always used as a counter for a for loop and initialized to zero before
use.  Eliminate the inner i variables.
kernel/auditsc.c:1295:8: warning: symbol 'i' shadows an earlier one
kernel/auditsc.c:1152:6: originally declared here
kernel/auditsc.c:1320:7: warning: symbol 'i' shadows an earlier one
kernel/auditsc.c:1152:6: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 3 changed files with 13 additions and 15 deletions Side-by-side Diff

... ... @@ -813,21 +813,21 @@
813 813 case AUDIT_MAKE_EQUIV: {
814 814 void *bufp = data;
815 815 u32 sizes[2];
816   - size_t len = nlmsg_len(nlh);
  816 + size_t msglen = nlmsg_len(nlh);
817 817 char *old, *new;
818 818  
819 819 err = -EINVAL;
820   - if (len < 2 * sizeof(u32))
  820 + if (msglen < 2 * sizeof(u32))
821 821 break;
822 822 memcpy(sizes, bufp, 2 * sizeof(u32));
823 823 bufp += 2 * sizeof(u32);
824   - len -= 2 * sizeof(u32);
825   - old = audit_unpack_string(&bufp, &len, sizes[0]);
  824 + msglen -= 2 * sizeof(u32);
  825 + old = audit_unpack_string(&bufp, &msglen, sizes[0]);
826 826 if (IS_ERR(old)) {
827 827 err = PTR_ERR(old);
828 828 break;
829 829 }
830   - new = audit_unpack_string(&bufp, &len, sizes[1]);
  830 + new = audit_unpack_string(&bufp, &msglen, sizes[1]);
831 831 if (IS_ERR(new)) {
832 832 err = PTR_ERR(new);
833 833 kfree(old);
kernel/auditfilter.c
Diff comments   View file @ 7719e43
... ... @@ -417,7 +417,7 @@
417 417 static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
418 418 {
419 419 struct audit_entry *entry;
420   - struct audit_field *f;
  420 + struct audit_field *ino_f;
421 421 int err = 0;
422 422 int i;
423 423  
... ... @@ -499,9 +499,9 @@
499 499 }
500 500 }
501 501  
502   - f = entry->rule.inode_f;
503   - if (f) {
504   - switch(f->op) {
  502 + ino_f = entry->rule.inode_f;
  503 + if (ino_f) {
  504 + switch(ino_f->op) {
505 505 case AUDIT_NOT_EQUAL:
506 506 entry->rule.inode_f = NULL;
507 507 case AUDIT_EQUAL:
... ... @@ -526,7 +526,7 @@
526 526 {
527 527 int err = 0;
528 528 struct audit_entry *entry;
529   - struct audit_field *f;
  529 + struct audit_field *ino_f;
530 530 void *bufp;
531 531 size_t remain = datasz - sizeof(struct audit_rule_data);
532 532 int i;
... ... @@ -654,9 +654,9 @@
654 654 }
655 655 }
656 656  
657   - f = entry->rule.inode_f;
658   - if (f) {
659   - switch(f->op) {
  657 + ino_f = entry->rule.inode_f;
  658 + if (ino_f) {
  659 + switch(ino_f->op) {
660 660 case AUDIT_NOT_EQUAL:
661 661 entry->rule.inode_f = NULL;
662 662 case AUDIT_EQUAL:
... ... @@ -1293,7 +1293,6 @@
1293 1293 break; }
1294 1294  
1295 1295 case AUDIT_SOCKETCALL: {
1296   - int i;
1297 1296 struct audit_aux_data_socketcall *axs = (void *)aux;
1298 1297 audit_log_format(ab, "nargs=%d", axs->nargs);
1299 1298 for (i=0; i<axs->nargs; i++)
... ... @@ -1318,7 +1317,6 @@
1318 1317  
1319 1318 for (aux = context->aux_pids; aux; aux = aux->next) {
1320 1319 struct audit_aux_data_pids *axs = (void *)aux;
1321   - int i;
1322 1320  
1323 1321 for (i = 0; i < axs->pid_count; i++)
1324 1322 if (audit_log_pid_context(context, axs->target_pid[i],