Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4043cde8 authored by Eric Paris's avatar Eric Paris Committed by Al Viro
Browse files

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: default avatarEric Paris <eparis@redhat.com>
parent 633b4545

fs/namei.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -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)

static char *getname_flags(const char __user *filename, int flags, int *empty)

{

{

	char *tmp, *result;

	char *result = __getname();

	int retval;





	result = ERR_PTR(-ENOMEM);

	if (!result)

	tmp = __getname();

		return ERR_PTR(-ENOMEM);

	if (tmp)  {

		int retval = do_getname(filename, tmp);





		result = tmp;

	retval = do_getname(filename, result);

	if (retval < 0) {

	if (retval < 0) {

		if (retval == -ENOENT && empty)

		if (retval == -ENOENT && empty)

			*empty = 1;

			*empty = 1;

		if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {

		if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {

				__putname(tmp);

			__putname(result);

				result = ERR_PTR(retval);

			return ERR_PTR(retval);

			}

		}

		}

	}

	}

	audit_getname(result);

	audit_getname(result);

kernel/auditsc.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1913,9 +1913,6 @@ void __audit_getname(const char *name) 
	struct audit_context *context = current->audit_context;

	struct audit_context *context = current->audit_context;

	struct audit_names *n;

	struct audit_names *n;





	if (IS_ERR(name) || !name)

		return;



	if (!context->in_syscall) {

	if (!context->in_syscall) {

#if AUDIT_DEBUG == 2

#if AUDIT_DEBUG == 2

		printk(KERN_ERR "%s:%d(:%d): ignoring getname(%p)\n",

		printk(KERN_ERR "%s:%d(:%d): ignoring getname(%p)\n",