2013-04-01 07:00:26

by Dmitry Monakhov

Subject: [PATCH] audit: destroy filename 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

Signed-off-by: Dmitry Monakhov <[email protected]>
---
kernel/auditsc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index a371f85..bfe7ca6 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1010,7 +1010,7 @@ static inline void audit_free_names(struct audit_context *context)
list_for_each_entry_safe(n, next, &context->names_list, list) {
list_del(&n->list);
if (n->name && n->name_put)
- __putname(n->name);
+ final_putname(n->name);
if (n->should_free)
kfree(n);
}
@@ -2036,7 +2036,7 @@ void audit_putname(struct filename *name)
BUG_ON(!context);
if (!context->in_syscall) {
#if AUDIT_DEBUG == 2
- printk(KERN_ERR "%s:%d(:%d): __putname(%p)\n",
+ printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n",
__FILE__, __LINE__, context->serial, name);
if (context->name_count) {
struct audit_names *n;
@@ -2047,7 +2047,7 @@ void audit_putname(struct filename *name)
n->name, n->name->name ?: "(null)");
}
#endif
- __putname(name);
+ final_putname(name);
}
#if AUDIT_DEBUG
else {
--
1.7.1

2013-04-10 17:07:31

by Jeff Layton

Subject: Re: [PATCH] audit: destroy filename correctly

On Mon, 1 Apr 2013 11:00:00 +0400
Dmitry Monakhov <[email protected]> wrote:

> 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
>
> Signed-off-by: Dmitry Monakhov <[email protected]>
> ---
> kernel/auditsc.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index a371f85..bfe7ca6 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -1010,7 +1010,7 @@ static inline void audit_free_names(struct audit_context *context)
> list_for_each_entry_safe(n, next, &context->names_list, list) {
> list_del(&n->list);
> if (n->name && n->name_put)
> - __putname(n->name);
> + final_putname(n->name);
> if (n->should_free)
> kfree(n);
> }
> @@ -2036,7 +2036,7 @@ void audit_putname(struct filename *name)
> BUG_ON(!context);
> if (!context->in_syscall) {
> #if AUDIT_DEBUG == 2
> - printk(KERN_ERR "%s:%d(:%d): __putname(%p)\n",
> + printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n",
> __FILE__, __LINE__, context->serial, name);
> if (context->name_count) {
> struct audit_names *n;
> @@ -2047,7 +2047,7 @@ void audit_putname(struct filename *name)
> n->name, n->name->name ?: "(null)");
> }
> #endif
> - __putname(name);
> + final_putname(name);
> }
> #if AUDIT_DEBUG
> else {

Looks correct to me...

Reviewed-by: Jeff Layton <[email protected]>

2013-04-22 08:08:13

by Dmitry Monakhov

Subject: Re: [PATCH] audit: destroy filename correctly PING.

On Mon, 1 Apr 2013 11:00:00 +0400, Dmitry Monakhov <[email protected]> wrote:
Ping. Patch (https://lkml.org/lkml/2013/4/1/65) was not a 1'st April's joke.
Add CC:[email protected]
> 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
>
> Signed-off-by: Dmitry Monakhov <[email protected]>
> ---
> kernel/auditsc.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index a371f85..bfe7ca6 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -1010,7 +1010,7 @@ static inline void audit_free_names(struct audit_context *context)
> list_for_each_entry_safe(n, next, &context->names_list, list) {
> list_del(&n->list);
> if (n->name && n->name_put)
> - __putname(n->name);
> + final_putname(n->name);
> if (n->should_free)
> kfree(n);
> }
> @@ -2036,7 +2036,7 @@ void audit_putname(struct filename *name)
> BUG_ON(!context);
> if (!context->in_syscall) {
> #if AUDIT_DEBUG == 2
> - printk(KERN_ERR "%s:%d(:%d): __putname(%p)\n",
> + printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n",
> __FILE__, __LINE__, context->serial, name);
> if (context->name_count) {
> struct audit_names *n;
> @@ -2047,7 +2047,7 @@ void audit_putname(struct filename *name)
> n->name, n->name->name ?: "(null)");
> }
> #endif
> - __putname(name);
> + final_putname(name);
> }
> #if AUDIT_DEBUG
> else {
> --
> 1.7.1
>

2013-04-23 14:24:18

by Eric Paris

Subject: Re: [PATCH] audit: destroy filename correctly PING.

I picked it up for 3.10. Sorry, should have said something. Thanks!

-Eric

----- Original Message -----
> On Mon, 1 Apr 2013 11:00:00 +0400, Dmitry Monakhov <[email protected]>
> wrote:
> Ping. Patch (https://lkml.org/lkml/2013/4/1/65) was not a 1'st April's joke.
> Add CC:[email protected]
> > 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
> >
> > Signed-off-by: Dmitry Monakhov <[email protected]>
> > ---
> > kernel/auditsc.c | 6 +++---
> > 1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> > index a371f85..bfe7ca6 100644
> > --- a/kernel/auditsc.c
> > +++ b/kernel/auditsc.c
> > @@ -1010,7 +1010,7 @@ static inline void audit_free_names(struct
> > audit_context *context)
> > list_for_each_entry_safe(n, next, &context->names_list, list) {
> > list_del(&n->list);
> > if (n->name && n->name_put)
> > - __putname(n->name);
> > + final_putname(n->name);
> > if (n->should_free)
> > kfree(n);
> > }
> > @@ -2036,7 +2036,7 @@ void audit_putname(struct filename *name)
> > BUG_ON(!context);
> > if (!context->in_syscall) {
> > #if AUDIT_DEBUG == 2
> > - printk(KERN_ERR "%s:%d(:%d): __putname(%p)\n",
> > + printk(KERN_ERR "%s:%d(:%d): final_putname(%p)\n",
> > __FILE__, __LINE__, context->serial, name);
> > if (context->name_count) {
> > struct audit_names *n;
> > @@ -2047,7 +2047,7 @@ void audit_putname(struct filename *name)
> > n->name, n->name->name ?: "(null)");
> > }
> > #endif
> > - __putname(name);
> > + final_putname(name);
> > }
> > #if AUDIT_DEBUG
> > else {
> > --
> > 1.7.1
> >
>