diff options
author | Dmitry Monakhov <dmonakhov@openvz.org> | 2013-04-01 03:00:00 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2013-04-10 13:21:52 -0400 |
commit | 65ada7bc02e2dcea6dea1f11876e712d5ea7e9ba (patch) | |
tree | 26cb09addd5656bc6e9806834e41097683f5ae40 /kernel/auditsc.c | |
parent | 2540334adc1c7241a7f91a9cf7ec56776d3f601b (diff) |
audit: destroy long filenames correctly
filename should be destroyed via final_putname() instead of __putname()
Otherwise this result in following BUGON() in case of long names:
kernel BUG at mm/slab.c:3006!
Call Trace:
kmem_cache_free+0x1c1/0x850
audit_putname+0x88/0x90
putname+0x73/0x80
sys_symlinkat+0x120/0x150
sys_symlink+0x16/0x20
system_call_fastpath+0x16/0x1b
Introduced-in: 7950e3852
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 77c705c302f7..b59ffb293ded 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -1024,7 +1024,7 @@ static inline void audit_free_names(struct audit_context *context) | |||
1024 | list_for_each_entry_safe(n, next, &context->names_list, list) { | 1024 | list_for_each_entry_safe(n, next, &context->names_list, list) { |
1025 | list_del(&n->list); | 1025 | list_del(&n->list); |
1026 | if (n->name && n->name_put) | 1026 | if (n->name && n->name_put) |
1027 | __putname(n->name); | 1027 | final_putname(n->name); |
1028 | if (n->should_free) | 1028 | if (n->should_free) |
1029 | kfree(n); | 1029 | kfree(n); |
1030 | } | 1030 | } |
@@ -2050,7 +2050,7 @@ void audit_putname(struct filename *name) | |||
2050 | BUG_ON(!context); | 2050 | BUG_ON(!context); |
2051 | if (!context->in_syscall) { | 2051 | if (!context->in_syscall) { |
2052 | #if AUDIT_DEBUG == 2 | 2052 | #if AUDIT_DEBUG == 2 |
2053 | printk(KERN_ERR "%s:%d(:%d): __putname(%p)\n", | 2053 | printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n", |
2054 | __FILE__, __LINE__, context->serial, name); | 2054 | __FILE__, __LINE__, context->serial, name); |
2055 | if (context->name_count) { | 2055 | if (context->name_count) { |
2056 | struct audit_names *n; | 2056 | struct audit_names *n; |
@@ -2061,7 +2061,7 @@ void audit_putname(struct filename *name) | |||
2061 | n->name, n->name->name ?: "(null)"); | 2061 | n->name, n->name->name ?: "(null)"); |
2062 | } | 2062 | } |
2063 | #endif | 2063 | #endif |
2064 | __putname(name); | 2064 | final_putname(name); |
2065 | } | 2065 | } |
2066 | #if AUDIT_DEBUG | 2066 | #if AUDIT_DEBUG |
2067 | else { | 2067 | else { |