summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2013-04-16 10:17:02 -0400
committerEric Paris <eparis@redhat.com>2013-04-16 10:17:02 -0400
commit34c474de7b4bd451396d67647ac728b0433379a9 (patch)
tree739ab98b2c0e0fa92f49ba3dee27c15a5915ea9e
parent72199caa8dc7f71d29328069b588340201ee73d7 (diff)
downloadlwn-34c474de7b4bd451396d67647ac728b0433379a9.tar.gz
lwn-34c474de7b4bd451396d67647ac728b0433379a9.zip
audit: fix build break when AUDIT_DEBUG == 2
Looks like this one has been around since 5195d8e21: kernel/auditsc.c: In function ‘audit_free_names’: kernel/auditsc.c:998: error: ‘i’ undeclared (first use in this function) ...and this warning: kernel/auditsc.c: In function ‘audit_putname’: kernel/auditsc.c:2045: warning: ‘i’ may be used uninitialized in this function Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--kernel/auditsc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 67df4ee1d3b6..4baf61d39836 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1001,6 +1001,8 @@ static inline void audit_free_names(struct audit_context *context)
#if AUDIT_DEBUG == 2
if (context->put_count + context->ino_count != context->name_count) {
+ int i = 0;
+
printk(KERN_ERR "%s:%d(:%d): major=%d in_syscall=%d"
" name_count=%d put_count=%d"
" ino_count=%d [NOT freeing]\n",
@@ -1009,7 +1011,7 @@ static inline void audit_free_names(struct audit_context *context)
context->name_count, context->put_count,
context->ino_count);
list_for_each_entry(n, &context->names_list, list) {
- printk(KERN_ERR "names[%d] = %p = %s\n", i,
+ printk(KERN_ERR "names[%d] = %p = %s\n", i++,
n->name, n->name->name ?: "(null)");
}
dump_stack();
@@ -2050,10 +2052,10 @@ void audit_putname(struct filename *name)
__FILE__, __LINE__, context->serial, name);
if (context->name_count) {
struct audit_names *n;
- int i;
+ int i = 0;
list_for_each_entry(n, &context->names_list, list)
- printk(KERN_ERR "name[%d] = %p = %s\n", i,
+ printk(KERN_ERR "name[%d] = %p = %s\n", i++,
n->name, n->name->name ?: "(null)");
}
#endif