mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-20 13:41:30 +00:00
[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>
This commit is contained in:
parent
c782f242f0
commit
7719e437fa
3 changed files with 13 additions and 15 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue