* [PATCH] audit: printk USER_AVC messages when audit isn't enabled
@ 2013-07-26 1:02 Tyler Hicks
2013-08-16 19:05 ` Tyler Hicks
2013-08-20 14:45 ` Richard Guy Briggs
0 siblings, 2 replies; 5+ messages in thread
From: Tyler Hicks @ 2013-07-26 1:02 UTC (permalink / raw)
To: Al Viro, Eric Paris; +Cc: linux-audit
When the audit=1 kernel parameter is absent and auditd is not running,
AUDIT_USER_AVC messages are being silently discarded.
AUDIT_USER_AVC messages should be sent to userspace using printk(), as
mentioned in the commit message of
4a4cd633b575609b741a1de7837223a2d9e1c34c ("AUDIT: Optimise the
audit-disabled case for discarding user messages").
When audit_enabled is 0, audit_receive_msg() discards all user messages
except for AUDIT_USER_AVC messages. However, audit_log_common_recv_msg()
refuses to allocate an audit_buffer if audit_enabled is 0. The fix is to
special case AUDIT_USER_AVC messages in both functions.
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Cc: linux-audit@redhat.com
---
It looks like commit 50397bd1e471391d27f64efad9271459c913de87 ("[AUDIT] clean
up audit_receive_msg()") introduced this bug, so I think that this patch should
also get the tag:
Cc: <stable@kernel.org> # v2.6.25+
Al and Eric, I'll leave that up to you two.
Here's my test matrix showing where messages end up as a result of a call to
libaudit's audit_log_user_avc_message():
| unpatched patched
----------------+--------------------------------
w/o audit=1 & | *dropped* syslog
w/o auditd |
|
w/ audit=1 & | syslog syslog
w/o auditd |
|
w/o audit=1 & | audit.log audit.log
w/ auditd |
|
w/ audit=1 & | audit.log audit.log
w/ auditd |
Thanks!
kernel/audit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/audit.c b/kernel/audit.c
index 91e53d0..f4f2773 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type)
int rc = 0;
uid_t uid = from_kuid(&init_user_ns, current_uid());
- if (!audit_enabled) {
+ if (!audit_enabled && msg_type != AUDIT_USER_AVC) {
*ab = NULL;
return rc;
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] audit: printk USER_AVC messages when audit isn't enabled 2013-07-26 1:02 [PATCH] audit: printk USER_AVC messages when audit isn't enabled Tyler Hicks @ 2013-08-16 19:05 ` Tyler Hicks 2013-08-19 23:59 ` Kees Cook 2013-08-20 14:45 ` Richard Guy Briggs 1 sibling, 1 reply; 5+ messages in thread From: Tyler Hicks @ 2013-08-16 19:05 UTC (permalink / raw) To: Al Viro, Eric Paris; +Cc: linux-audit [-- Attachment #1.1: Type: text/plain, Size: 2513 bytes --] On 2013-07-25 18:02:55, Tyler Hicks wrote: > When the audit=1 kernel parameter is absent and auditd is not running, > AUDIT_USER_AVC messages are being silently discarded. > > AUDIT_USER_AVC messages should be sent to userspace using printk(), as > mentioned in the commit message of > 4a4cd633b575609b741a1de7837223a2d9e1c34c ("AUDIT: Optimise the > audit-disabled case for discarding user messages"). > > When audit_enabled is 0, audit_receive_msg() discards all user messages > except for AUDIT_USER_AVC messages. However, audit_log_common_recv_msg() > refuses to allocate an audit_buffer if audit_enabled is 0. The fix is to > special case AUDIT_USER_AVC messages in both functions. > > Signed-off-by: Tyler Hicks <tyhicks@canonical.com> > Cc: Al Viro <viro@zeniv.linux.org.uk> > Cc: Eric Paris <eparis@redhat.com> > Cc: linux-audit@redhat.com > --- Hello Al and Eric - I wanted to bring this patch back to your attention so it doesn't get forgotten. This is a fairly nasty bug in distros that leave auditd as optional but still build packages against libaudit. Thanks! Tyler > > It looks like commit 50397bd1e471391d27f64efad9271459c913de87 ("[AUDIT] clean > up audit_receive_msg()") introduced this bug, so I think that this patch should > also get the tag: > > Cc: <stable@kernel.org> # v2.6.25+ > > Al and Eric, I'll leave that up to you two. > > > Here's my test matrix showing where messages end up as a result of a call to > libaudit's audit_log_user_avc_message(): > > | unpatched patched > ----------------+-------------------------------- > w/o audit=1 & | *dropped* syslog > w/o auditd | > | > w/ audit=1 & | syslog syslog > w/o auditd | > | > w/o audit=1 & | audit.log audit.log > w/ auditd | > | > w/ audit=1 & | audit.log audit.log > w/ auditd | > > Thanks! > > kernel/audit.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/audit.c b/kernel/audit.c > index 91e53d0..f4f2773 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) > int rc = 0; > uid_t uid = from_kuid(&init_user_ns, current_uid()); > > - if (!audit_enabled) { > + if (!audit_enabled && msg_type != AUDIT_USER_AVC) { > *ab = NULL; > return rc; > } > -- > 1.8.3.2 > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit [-- Attachment #1.2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] audit: printk USER_AVC messages when audit isn't enabled 2013-08-16 19:05 ` Tyler Hicks @ 2013-08-19 23:59 ` Kees Cook 2014-01-22 17:39 ` Richard Guy Briggs 0 siblings, 1 reply; 5+ messages in thread From: Kees Cook @ 2013-08-19 23:59 UTC (permalink / raw) To: Tyler Hicks, Andrew Morton; +Cc: Al Viro, Eric Paris, linux-audit, LKML On Fri, Aug 16, 2013 at 12:05 PM, Tyler Hicks <tyhicks@canonical.com> wrote: > On 2013-07-25 18:02:55, Tyler Hicks wrote: >> When the audit=1 kernel parameter is absent and auditd is not running, >> AUDIT_USER_AVC messages are being silently discarded. >> >> AUDIT_USER_AVC messages should be sent to userspace using printk(), as >> mentioned in the commit message of >> 4a4cd633b575609b741a1de7837223a2d9e1c34c ("AUDIT: Optimise the >> audit-disabled case for discarding user messages"). >> >> When audit_enabled is 0, audit_receive_msg() discards all user messages >> except for AUDIT_USER_AVC messages. However, audit_log_common_recv_msg() >> refuses to allocate an audit_buffer if audit_enabled is 0. The fix is to >> special case AUDIT_USER_AVC messages in both functions. >> >> Signed-off-by: Tyler Hicks <tyhicks@canonical.com> >> Cc: Al Viro <viro@zeniv.linux.org.uk> >> Cc: Eric Paris <eparis@redhat.com> >> Cc: linux-audit@redhat.com >> --- > > Hello Al and Eric - I wanted to bring this patch back to your attention > so it doesn't get forgotten. This is a fairly nasty bug in distros that > leave auditd as optional but still build packages against libaudit. I haven't seen a lot of movement in the audit tree lately, but Andrew has helped push other fixes like this in the past. This fix seems entirely reasonable to me. :) Andrew, can you pick this up? Acked-by: Kees Cook <keescook@chromium.org> > > Thanks! > > Tyler > >> >> It looks like commit 50397bd1e471391d27f64efad9271459c913de87 ("[AUDIT] clean >> up audit_receive_msg()") introduced this bug, so I think that this patch should >> also get the tag: >> >> Cc: <stable@kernel.org> # v2.6.25+ Yeah, this seems like a good idea too. Thanks, -Kees >> >> Al and Eric, I'll leave that up to you two. >> >> >> Here's my test matrix showing where messages end up as a result of a call to >> libaudit's audit_log_user_avc_message(): >> >> | unpatched patched >> ----------------+-------------------------------- >> w/o audit=1 & | *dropped* syslog >> w/o auditd | >> | >> w/ audit=1 & | syslog syslog >> w/o auditd | >> | >> w/o audit=1 & | audit.log audit.log >> w/ auditd | >> | >> w/ audit=1 & | audit.log audit.log >> w/ auditd | >> >> Thanks! >> >> kernel/audit.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/kernel/audit.c b/kernel/audit.c >> index 91e53d0..f4f2773 100644 >> --- a/kernel/audit.c >> +++ b/kernel/audit.c >> @@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) >> int rc = 0; >> uid_t uid = from_kuid(&init_user_ns, current_uid()); >> >> - if (!audit_enabled) { >> + if (!audit_enabled && msg_type != AUDIT_USER_AVC) { >> *ab = NULL; >> return rc; >> } >> -- >> 1.8.3.2 >> >> -- >> Linux-audit mailing list >> Linux-audit@redhat.com >> https://www.redhat.com/mailman/listinfo/linux-audit > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit -- Kees Cook Chrome OS Security ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] audit: printk USER_AVC messages when audit isn't enabled 2013-08-19 23:59 ` Kees Cook @ 2014-01-22 17:39 ` Richard Guy Briggs 0 siblings, 0 replies; 5+ messages in thread From: Richard Guy Briggs @ 2014-01-22 17:39 UTC (permalink / raw) To: Kees Cook; +Cc: Tyler Hicks, Andrew Morton, linux-audit, Al Viro, LKML On 13/08/19, Kees Cook wrote: > On Fri, Aug 16, 2013 at 12:05 PM, Tyler Hicks <tyhicks@canonical.com> wrote: > > On 2013-07-25 18:02:55, Tyler Hicks wrote: > >> When the audit=1 kernel parameter is absent and auditd is not running, > >> AUDIT_USER_AVC messages are being silently discarded. > >> > >> AUDIT_USER_AVC messages should be sent to userspace using printk(), as > >> mentioned in the commit message of > >> 4a4cd633b575609b741a1de7837223a2d9e1c34c ("AUDIT: Optimise the > >> audit-disabled case for discarding user messages"). > >> > >> When audit_enabled is 0, audit_receive_msg() discards all user messages > >> except for AUDIT_USER_AVC messages. However, audit_log_common_recv_msg() > >> refuses to allocate an audit_buffer if audit_enabled is 0. The fix is to > >> special case AUDIT_USER_AVC messages in both functions. > >> > >> Signed-off-by: Tyler Hicks <tyhicks@canonical.com> > >> Cc: Al Viro <viro@zeniv.linux.org.uk> > >> Cc: Eric Paris <eparis@redhat.com> > >> Cc: linux-audit@redhat.com > >> --- > > > > Hello Al and Eric - I wanted to bring this patch back to your attention > > so it doesn't get forgotten. This is a fairly nasty bug in distros that > > leave auditd as optional but still build packages against libaudit. > > I haven't seen a lot of movement in the audit tree lately, but Andrew > has helped push other fixes like this in the past. This fix seems > entirely reasonable to me. :) Andrew, can you pick this up? This has also raised questions about AUDIT_USER_SELINUX_ERR, and whether that should be special-cased to allow it through to syslog if audit is disabled. There wasn't originally a special case for AUDIT_USER_SELINUX_ERR. Should one be added at this time? > Acked-by: Kees Cook <keescook@chromium.org> > > > > > Thanks! > > > > Tyler > > > >> > >> It looks like commit 50397bd1e471391d27f64efad9271459c913de87 ("[AUDIT] clean > >> up audit_receive_msg()") introduced this bug, so I think that this patch should > >> also get the tag: > >> > >> Cc: <stable@kernel.org> # v2.6.25+ > > Yeah, this seems like a good idea too. > > Thanks, > > -Kees > > >> > >> Al and Eric, I'll leave that up to you two. > >> > >> > >> Here's my test matrix showing where messages end up as a result of a call to > >> libaudit's audit_log_user_avc_message(): > >> > >> | unpatched patched > >> ----------------+-------------------------------- > >> w/o audit=1 & | *dropped* syslog > >> w/o auditd | > >> | > >> w/ audit=1 & | syslog syslog > >> w/o auditd | > >> | > >> w/o audit=1 & | audit.log audit.log > >> w/ auditd | > >> | > >> w/ audit=1 & | audit.log audit.log > >> w/ auditd | > >> > >> Thanks! > >> > >> kernel/audit.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/kernel/audit.c b/kernel/audit.c > >> index 91e53d0..f4f2773 100644 > >> --- a/kernel/audit.c > >> +++ b/kernel/audit.c > >> @@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) > >> int rc = 0; > >> uid_t uid = from_kuid(&init_user_ns, current_uid()); > >> > >> - if (!audit_enabled) { > >> + if (!audit_enabled && msg_type != AUDIT_USER_AVC) { > >> *ab = NULL; > >> return rc; > >> } > >> -- > >> 1.8.3.2 > >> > >> -- > >> Linux-audit mailing list > >> Linux-audit@redhat.com > >> https://www.redhat.com/mailman/listinfo/linux-audit > > > > -- > > Linux-audit mailing list > > Linux-audit@redhat.com > > https://www.redhat.com/mailman/listinfo/linux-audit > > > > -- > Kees Cook > Chrome OS Security > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit - RGB -- Richard Guy Briggs <rbriggs@redhat.com> Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] audit: printk USER_AVC messages when audit isn't enabled 2013-07-26 1:02 [PATCH] audit: printk USER_AVC messages when audit isn't enabled Tyler Hicks 2013-08-16 19:05 ` Tyler Hicks @ 2013-08-20 14:45 ` Richard Guy Briggs 1 sibling, 0 replies; 5+ messages in thread From: Richard Guy Briggs @ 2013-08-20 14:45 UTC (permalink / raw) To: Tyler Hicks; +Cc: linux-audit, Al Viro On Thu, Jul 25, 2013 at 06:02:55PM -0700, Tyler Hicks wrote: > When the audit=1 kernel parameter is absent and auditd is not running, > AUDIT_USER_AVC messages are being silently discarded. > > AUDIT_USER_AVC messages should be sent to userspace using printk(), as > mentioned in the commit message of > 4a4cd633b575609b741a1de7837223a2d9e1c34c ("AUDIT: Optimise the > audit-disabled case for discarding user messages"). > > When audit_enabled is 0, audit_receive_msg() discards all user messages > except for AUDIT_USER_AVC messages. However, audit_log_common_recv_msg() > refuses to allocate an audit_buffer if audit_enabled is 0. The fix is to > special case AUDIT_USER_AVC messages in both functions. > > Signed-off-by: Tyler Hicks <tyhicks@canonical.com> > Cc: Al Viro <viro@zeniv.linux.org.uk> > Cc: Eric Paris <eparis@redhat.com> > Cc: linux-audit@redhat.com > --- > > It looks like commit 50397bd1e471391d27f64efad9271459c913de87 ("[AUDIT] clean > up audit_receive_msg()") introduced this bug, so I think that this patch should > also get the tag: > > Cc: <stable@kernel.org> # v2.6.25+ > > Al and Eric, I'll leave that up to you two. Hi Tyler, This patch looks entirely reasonable to me. Acked-by: Richard Guy Briggs <rbriggs@redhat.com> > Here's my test matrix showing where messages end up as a result of a call to > libaudit's audit_log_user_avc_message(): > > | unpatched patched > ----------------+-------------------------------- > w/o audit=1 & | *dropped* syslog > w/o auditd | > | > w/ audit=1 & | syslog syslog > w/o auditd | > | > w/o audit=1 & | audit.log audit.log > w/ auditd | > | > w/ audit=1 & | audit.log audit.log > w/ auditd | > > Thanks! > > kernel/audit.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/audit.c b/kernel/audit.c > index 91e53d0..f4f2773 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -613,7 +613,7 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) > int rc = 0; > uid_t uid = from_kuid(&init_user_ns, current_uid()); > > - if (!audit_enabled) { > + if (!audit_enabled && msg_type != AUDIT_USER_AVC) { > *ab = NULL; > return rc; > } > -- > 1.8.3.2 > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit - RGB -- Richard Guy Briggs <rbriggs@redhat.com> Senior Software Engineer Kernel Security AMER ENG Base Operating Systems Remote, Ottawa, Canada Voice: +1.647.777.2635 Internal: (81) 32635 Alt: +1.613.693.0684x3545 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-22 17:39 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-26 1:02 [PATCH] audit: printk USER_AVC messages when audit isn't enabled Tyler Hicks 2013-08-16 19:05 ` Tyler Hicks 2013-08-19 23:59 ` Kees Cook 2014-01-22 17:39 ` Richard Guy Briggs 2013-08-20 14:45 ` Richard Guy Briggs
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox