aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2018-02-21 04:30:07 -0500
committerPaul Moore <paul@paul-moore.com>2018-02-21 18:45:36 -0500
commit23138ead270045f1b3e912e667967b6094244999 (patch)
tree0852108566b274e74e378c01a550f21845f4f099
parent94d14e3e7b41d99f0d62a41fd856183057e1e474 (diff)
audit: return on memory error to avoid null pointer dereference
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>
-rw-r--r--kernel/audit.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 5c2544984375..2de74be7cef5 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1059,6 +1059,8 @@ static void audit_log_feature_change(int which, u32 old_feature, u32 new_feature
1059 return; 1059 return;
1060 1060
1061 ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE); 1061 ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_FEATURE_CHANGE);
1062 if (!ab)
1063 return;
1062 audit_log_task_info(ab, current); 1064 audit_log_task_info(ab, current);
1063 audit_log_format(ab, " feature=%s old=%u new=%u old_lock=%u new_lock=%u res=%d", 1065 audit_log_format(ab, " feature=%s old=%u new=%u old_lock=%u new_lock=%u res=%d",
1064 audit_feature_names[which], !!old_feature, !!new_feature, 1066 audit_feature_names[which], !!old_feature, !!new_feature,