From: Steve Grubb <sgrubb@redhat.com>
To: linux-audit@redhat.com
Cc: Richard Guy Briggs <rgb@redhat.com>
Subject: Re: Format specifier issue when building kernel
Date: Fri, 01 Nov 2013 12:34:55 -0400 [thread overview]
Message-ID: <5863749.irKmN4I7yS@x2> (raw)
In-Reply-To: <20131101162455.GB24236@madcap2.tricolour.ca>
On Friday, November 01, 2013 12:24:55 PM Richard Guy Briggs wrote:
> On Thu, Oct 31, 2013 at 12:25:55PM -0700, William Roberts wrote:
> > > + if (msg_type != AUDIT_USER_TTY) {
> > > + char fmt[64];
> > > + strcat(fmt, " msg='%.");
> > > + strcat(fmt, "AUDIT_MESSAGE_TEXT_MAX");
> > > + strcat(fmt, "s'");
> > > + audit_log_format(ab, fmt, (char *)data);
> > > + } else {
> >
> > I am ok with this. In fact I was going to do this the first time, but I
> > thought their would be some explicit reason to avoid the additional
> > run time overhead as the concat could be made at compile time.
>
> Ok, this was in danger of starting with fmt in an unknown state. Latest
> patch:
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> @@ -148,6 +148,8 @@ DEFINE_MUTEX(audit_cmd_mutex);
> * should be at least that large. */
> #define AUDIT_BUFSIZ 1024
>
> +char usermsg_format[64] = "";
You might want this ^^^ to be static so its not global in scope.
-Steve
> /* AUDIT_MAXFREE is the number of empty audit_buffers we keep on the
> * audit_freelist. Doing so eliminates many kmalloc/kfree calls. */
> #define AUDIT_MAXFREE (2*NR_CPUS)
> @@ -714,11 +716,15 @@ static int audit_receive_msg(struct sk_buff *skb,
> struct nlmsghdr *nlh) break;
> }
> audit_log_common_recv_msg(&ab, msg_type);
> - if (msg_type != AUDIT_USER_TTY)
> - audit_log_format(ab,
> - " msg='%.AUDIT_MESSAGE_TEXT_MAXs'",
> + if (msg_type != AUDIT_USER_TTY) {
> + if (unlikely(usermsg_format[0] == 0))
> + snprintf(usermsg_format,
> + sizeof(usermsg_format),
> + " msg=\'%%.%ds\'",
> + AUDIT_MESSAGE_TEXT_MAX);
> + audit_log_format(ab, usermsg_format,
> (char *)data);
> - else {
> + } else {
> int size;
>
> audit_log_format(ab, " data=");
>
> - 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
>
> --
> Linux-audit mailing list
> Linux-audit@redhat.com
> https://www.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2013-11-01 16:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-28 23:30 Format specifier issue when building kernel William Roberts
2013-10-28 23:31 ` William Roberts
2013-10-29 1:35 ` Richard Guy Briggs
2013-10-29 1:43 ` William Roberts
2013-10-29 3:55 ` William Roberts
2013-10-31 18:45 ` Richard Guy Briggs
2013-10-31 19:25 ` William Roberts
2013-11-01 16:24 ` Richard Guy Briggs
2013-11-01 16:34 ` Steve Grubb [this message]
2013-11-01 16:38 ` Richard Guy Briggs
2013-11-01 19:57 ` Richard Guy Briggs
2013-11-01 22:10 ` William Roberts
2013-11-01 22:20 ` David Rebman
2013-11-01 22:22 ` William Roberts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5863749.irKmN4I7yS@x2 \
--to=sgrubb@redhat.com \
--cc=linux-audit@redhat.com \
--cc=rgb@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox