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

Commit 0a3b483e authored by Amy Griffis's avatar Amy Griffis Committed by Al Viro
Browse files

[PATCH] fix audit_krule_to_{rule,data} return values 



Don't return -ENOMEM when callers of these functions are checking for
a NULL return.  Bug noticed by Serge Hallyn.

Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3c66251e

kernel/auditfilter.c

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static struct audit_rule *audit_krule_to_rule(struct audit_krule *krule) 


	rule = kmalloc(sizeof(*rule), GFP_KERNEL);

	if (unlikely(!rule))

		return ERR_PTR(-ENOMEM);

		return NULL;

	memset(rule, 0, sizeof(*rule));



	rule->flags = krule->flags | krule->listnr;
@@ -322,7 +322,7 @@ static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule) 


	data = kmalloc(sizeof(*data) + krule->buflen, GFP_KERNEL);

	if (unlikely(!data))

		return ERR_PTR(-ENOMEM);

		return NULL;

	memset(data, 0, sizeof(*data));



	data->flags = krule->flags | krule->listnr;