diff options
| author |   Eric Paris <eparis@redhat.com> | 2012-01-03 14:23:08 -0500 |
|---|---|---|
| committer |   Al Viro <viro@zeniv.linux.org.uk> | 2012-01-17 16:17:01 -0500 |
| commit | 4043cde8ecf7f7d880eb1133c201a3d392fd68c3 (patch) | |
| tree | d740c60e6b56565a7e996c3d0308e66f7c8651f8 | |
| parent | audit: only allow tasks to set their loginuid if it is -1 (diff) | |
| download | linux-dev-4043cde8ecf7f7d880eb1133c201a3d392fd68c3.tar.xz linux-dev-4043cde8ecf7f7d880eb1133c201a3d392fd68c3.zip | |
audit: do not call audit_getname on error
Just a code cleanup really. We don't need to make a function call just for
it to return on error. This also makes the VFS function even easier to follow
and removes a conditional on a hot path.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 28 | ||||
| -rw-r--r-- | kernel/auditsc.c | 3 |
2 files changed, 13 insertions, 18 deletions
diff --git a/fs/namei.c b/fs/namei.c index c283a1ec008e..208c6aa4a989 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -140,21 +140,19 @@ static int do_getname(const char __user *filename, char *page) static char *getname_flags(const char __user *filename, int flags, int *empty) { - char *tmp, *result; - - result = ERR_PTR(-ENOMEM); - tmp = __getname(); - if (tmp) { - int retval = do_getname(filename, tmp); - - result = tmp; - if (retval < 0) { - if (retval == -ENOENT && empty) - *empty = 1; - if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) { - __putname(tmp); - result = ERR_PTR(retval); - } + char *result = __getname(); + int retval; + + if (!result) + return ERR_PTR(-ENOMEM); + + retval = do_getname(filename, result); + if (retval < 0) { + if (retval == -ENOENT && empty) + *empty = 1; + if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) { + __putname(result); + return ERR_PTR(retval); } } audit_getname(result); diff --git a/kernel/auditsc.c b/kernel/auditsc.c index bd084a13c719..9161e70a4379 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1913,9 +1913,6 @@ void __audit_getname(const char *name) struct audit_context *context = current->audit_context; struct audit_names *n; - if (IS_ERR(name) || !name) - return; - if (!context->in_syscall) { #if AUDIT_DEBUG == 2 printk(KERN_ERR "%s:%d(:%d): ignoring getname(%p)\n", |