Commit ba0c7ae1 authored Feb 21, 2018 by Richard Guy Briggs Committed by Greg Kroah-Hartman May 30, 2018

audit: return on memory error to avoid null pointer dereference

[ Upstream commit 23138ead270045f1b3e912e667967b6094244999 ]

If there is a memory allocation error when trying to change an audit
kernel feature value, the ignored allocation error will trigger a NULL
pointer dereference oops on subsequent use of that pointer.  Return
instead.

Passes audit-testsuite.
See: https://github.com/linux-audit/audit-kernel/issues/76



Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
[PM: not necessary (other funcs check for NULL), but a good practice]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 11d549e7

kernel/audit.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -738,6 +738,8 @@ static void audit_log_feature_change(int which, u32 old_feature, u32 new_feature
		return;

		ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE);
		if (!ab)
		return;
		audit_log_task_info(ab, current);
		audit_log_format(ab, " feature=%s old=%u new=%u old_lock=%u new_lock=%u res=%d",
		audit_feature_names[which], !!old_feature, !!new_feature,