* [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2.
@ 2012-07-18 21:30 Peter Moody
2012-07-23 15:58 ` Peter Moody
2012-07-26 12:34 ` Jeff Layton
0 siblings, 2 replies; 4+ messages in thread
From: Peter Moody @ 2012-07-18 21:30 UTC (permalink / raw)
To: linux-audit
Additionally it looks like audit_free_names might return too early when
AUDIT_DEBUG was set to 2.
Signed-off-by: Peter Moody <pmoody@google.com>
---
kernel/auditsc.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 4b96415..0c1db46 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -997,6 +997,7 @@ 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",
@@ -1005,11 +1006,10 @@ 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 ?: "(null)");
}
dump_stack();
- return;
}
#endif
#if AUDIT_DEBUG
@@ -2084,10 +2084,10 @@ void audit_putname(const char *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 ?: "(null)");
}
#endif
--
1.7.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2.
2012-07-18 21:30 [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2 Peter Moody
@ 2012-07-23 15:58 ` Peter Moody
2012-07-26 12:34 ` Jeff Layton
1 sibling, 0 replies; 4+ messages in thread
From: Peter Moody @ 2012-07-23 15:58 UTC (permalink / raw)
To: linux-audit
Were there any comments on this?
On Wed, Jul 18, 2012 at 2:30 PM, Peter Moody <pmoody@google.com> wrote:
> Additionally it looks like audit_free_names might return too early when
> AUDIT_DEBUG was set to 2.
>
> Signed-off-by: Peter Moody <pmoody@google.com>
> ---
> kernel/auditsc.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 4b96415..0c1db46 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -997,6 +997,7 @@ 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",
> @@ -1005,11 +1006,10 @@ 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 ?: "(null)");
> }
> dump_stack();
> - return;
> }
> #endif
> #if AUDIT_DEBUG
> @@ -2084,10 +2084,10 @@ void audit_putname(const char *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 ?: "(null)");
> }
> #endif
> --
> 1.7.7.3
>
--
Peter Moody Google 1.650.253.7306
Security Engineer pgp:0xC3410038
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2.
2012-07-18 21:30 [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2 Peter Moody
2012-07-23 15:58 ` Peter Moody
@ 2012-07-26 12:34 ` Jeff Layton
2012-07-26 15:09 ` Peter Moody
1 sibling, 1 reply; 4+ messages in thread
From: Jeff Layton @ 2012-07-26 12:34 UTC (permalink / raw)
To: Peter Moody; +Cc: linux-audit
On Wed, 18 Jul 2012 14:30:41 -0700
Peter Moody <pmoody@google.com> wrote:
> Additionally it looks like audit_free_names might return too early when
> AUDIT_DEBUG was set to 2.
>
> Signed-off-by: Peter Moody <pmoody@google.com>
> ---
> kernel/auditsc.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index 4b96415..0c1db46 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -997,6 +997,7 @@ 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",
> @@ -1005,11 +1006,10 @@ 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 ?: "(null)");
> }
> dump_stack();
> - return;
> }
I'm not certain what the intent of this code was, but if you remove the
"return" above, then the printk above it that says "[NOT FREEING]". Will
no longer be valid.
> #endif
> #if AUDIT_DEBUG
> @@ -2084,10 +2084,10 @@ void audit_putname(const char *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 ?: "(null)");
> }
> #endif
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2.
2012-07-26 12:34 ` Jeff Layton
@ 2012-07-26 15:09 ` Peter Moody
0 siblings, 0 replies; 4+ messages in thread
From: Peter Moody @ 2012-07-26 15:09 UTC (permalink / raw)
To: Jeff Layton; +Cc: linux-audit
On Thu, Jul 26, 2012 at 5:34 AM, Jeff Layton <jlayton@redhat.com> wrote:
> On Wed, 18 Jul 2012 14:30:41 -0700
> Peter Moody <pmoody@google.com> wrote:
>
>> Additionally it looks like audit_free_names might return too early when
>> AUDIT_DEBUG was set to 2.
>>
>> Signed-off-by: Peter Moody <pmoody@google.com>
>> ---
>> kernel/auditsc.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
>> index 4b96415..0c1db46 100644
>> --- a/kernel/auditsc.c
>> +++ b/kernel/auditsc.c
>> @@ -997,6 +997,7 @@ 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",
>> @@ -1005,11 +1006,10 @@ 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 ?: "(null)");
>> }
>> dump_stack();
>> - return;
>> }
>
> I'm not certain what the intent of this code was, but if you remove the
> "return" above, then the printk above it that says "[NOT FREEING]". Will
> no longer be valid.
Oh, good point. I was going from what I presumed the intent to be from
the comment from above __audit_syscall_exit
/**
* Tear down after system call. If the audit context has been marked as
* auditable (either because of the AUDIT_RECORD_CONTEXT state from
* filtering, or because some other part of the kernel wrote an audit
* message), then write out the syscall information. In call cases,
* free the names stored from getname().
*/
(and I am assuming that 'in call cases' is a typo for 'in all cases')
The other thing is that my testing indicated that my box hung if
audit_free_names returned right there.
I need to wait for Eric anyway; hopefully he'll be able to shed some light.
Cheers,
peter
>> #endif
>> #if AUDIT_DEBUG
>> @@ -2084,10 +2084,10 @@ void audit_putname(const char *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 ?: "(null)");
>> }
>> #endif
--
Peter Moody Google 1.650.253.7306
Security Engineer pgp:0xC3410038
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-26 15:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-18 21:30 [PATCH] audit: missing variable declaration/initialization when AUDIT_DEBUG == 2 Peter Moody
2012-07-23 15:58 ` Peter Moody
2012-07-26 12:34 ` Jeff Layton
2012-07-26 15:09 ` Peter Moody
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox