diff options
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index fc0f928167e7..f3a461c0970a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -1988,7 +1988,6 @@ void __audit_inode(const char *name, const struct dentry *dentry) | |||
| 1988 | 1988 | ||
| 1989 | /** | 1989 | /** |
| 1990 | * audit_inode_child - collect inode info for created/removed objects | 1990 | * audit_inode_child - collect inode info for created/removed objects |
| 1991 | * @dname: inode's dentry name | ||
| 1992 | * @dentry: dentry being audited | 1991 | * @dentry: dentry being audited |
| 1993 | * @parent: inode of dentry parent | 1992 | * @parent: inode of dentry parent |
| 1994 | * | 1993 | * |
| @@ -2000,13 +1999,14 @@ void __audit_inode(const char *name, const struct dentry *dentry) | |||
| 2000 | * must be hooked prior, in order to capture the target inode during | 1999 | * must be hooked prior, in order to capture the target inode during |
| 2001 | * unsuccessful attempts. | 2000 | * unsuccessful attempts. |
| 2002 | */ | 2001 | */ |
| 2003 | void __audit_inode_child(const char *dname, const struct dentry *dentry, | 2002 | void __audit_inode_child(const struct dentry *dentry, |
| 2004 | const struct inode *parent) | 2003 | const struct inode *parent) |
| 2005 | { | 2004 | { |
| 2006 | int idx; | 2005 | int idx; |
| 2007 | struct audit_context *context = current->audit_context; | 2006 | struct audit_context *context = current->audit_context; |
| 2008 | const char *found_parent = NULL, *found_child = NULL; | 2007 | const char *found_parent = NULL, *found_child = NULL; |
| 2009 | const struct inode *inode = dentry->d_inode; | 2008 | const struct inode *inode = dentry->d_inode; |
| 2009 | const char *dname = dentry->d_name.name; | ||
| 2010 | int dirlen = 0; | 2010 | int dirlen = 0; |
| 2011 | 2011 | ||
| 2012 | if (!context->in_syscall) | 2012 | if (!context->in_syscall) |
| @@ -2014,9 +2014,6 @@ void __audit_inode_child(const char *dname, const struct dentry *dentry, | |||
| 2014 | 2014 | ||
| 2015 | if (inode) | 2015 | if (inode) |
| 2016 | handle_one(inode); | 2016 | handle_one(inode); |
| 2017 | /* determine matching parent */ | ||
| 2018 | if (!dname) | ||
| 2019 | goto add_names; | ||
| 2020 | 2017 | ||
| 2021 | /* parent is more likely, look for it first */ | 2018 | /* parent is more likely, look for it first */ |
| 2022 | for (idx = 0; idx < context->name_count; idx++) { | 2019 | for (idx = 0; idx < context->name_count; idx++) { |
