From 9063609bdc943b0971c145935d12a5f35023bf83 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Oct 2012 13:58:30 -0700 Subject: [PATCH] 3.6-stable patches added patches: fs-handle-failed-audit_log_start-properly.patch --- ...ndle-failed-audit_log_start-properly.patch | 34 +++++++++++++++++++ queue-3.6/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 queue-3.6/fs-handle-failed-audit_log_start-properly.patch diff --git a/queue-3.6/fs-handle-failed-audit_log_start-properly.patch b/queue-3.6/fs-handle-failed-audit_log_start-properly.patch new file mode 100644 index 00000000000..1bf129621cf --- /dev/null +++ b/queue-3.6/fs-handle-failed-audit_log_start-properly.patch @@ -0,0 +1,34 @@ +From d1c7d97ad58836affde6e39980b96527510b572e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Oct 2012 19:57:31 -0400 +Subject: fs: handle failed audit_log_start properly + +From: Sasha Levin + +commit d1c7d97ad58836affde6e39980b96527510b572e upstream. + +audit_log_start() may return NULL, this is unchecked by the caller in +audit_log_link_denied() and could cause a NULL ptr deref. + +Introduced by commit a51d9eaa ("fs: add link restriction audit reporting"). + +Signed-off-by: Sasha Levin +Signed-off-by: Al Viro +Cc: Dave Jones +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/audit.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/kernel/audit.c ++++ b/kernel/audit.c +@@ -1466,6 +1466,8 @@ void audit_log_link_denied(const char *o + + ab = audit_log_start(current->audit_context, GFP_KERNEL, + AUDIT_ANOM_LINK); ++ if (!ab) ++ return; + audit_log_format(ab, "op=%s action=denied", operation); + audit_log_format(ab, " pid=%d comm=", current->pid); + audit_log_untrustedstring(ab, current->comm); diff --git a/queue-3.6/series b/queue-3.6/series index f263c6f3768..f67f940f86f 100644 --- a/queue-3.6/series +++ b/queue-3.6/series @@ -52,3 +52,4 @@ pktgen-fix-crash-when-generating-ipv6-packets.patch mips-ath79-fix-cpu-ddr-frequency-calculation-for-srif-plls.patch kbuild-fix-accidental-revert-in-commit-fe04ddf.patch add-cdc-acm-support-for-the-cx93010-2x-ucmxx-usb-modem.patch +fs-handle-failed-audit_log_start-properly.patch -- 2.47.3