Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754920AbaAOWof (ORCPT ); Wed, 15 Jan 2014 17:44:35 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:44970 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753709AbaAOWob (ORCPT ); Wed, 15 Jan 2014 17:44:31 -0500 MIME-Version: 1.0 In-Reply-To: <34747889.Jh8c2aBYNA@x2> References: <1389808934-4446-1-git-send-email-wroberts@tresys.com> <3556794.adKRynleHP@x2> <34747889.Jh8c2aBYNA@x2> Date: Wed, 15 Jan 2014 17:44:29 -0500 Message-ID: Subject: Re: [PATCH v3 3/3] audit: Audit proc cmdline value From: William Roberts To: Steve Grubb Cc: "linux-audit@redhat.com" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Richard Guy Briggs , "viro@zeniv.linux.org.uk" , akpm@linux-foundation.org, Stephen Smalley , William Roberts Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 15, 2014 at 5:33 PM, Steve Grubb wrote: > On Wednesday, January 15, 2014 05:08:13 PM William Roberts wrote: >> On Wed, Jan 15, 2014 at 4:54 PM, Steve Grubb wrote: >> > On Wednesday, January 15, 2014 01:02:14 PM William Roberts wrote: >> >> During an audit event, cache and print the value of the process's >> >> cmdline value (proc//cmdline). This is useful in situations >> >> where processes are started via fork'd virtual machines where the >> >> comm field is incorrect. Often times, setting the comm field still >> >> is insufficient as the comm width is not very wide and most >> >> virtual machine "package names" do not fit. Also, during execution, >> >> many threads have their comm field set as well. By tying it back to >> >> the global cmdline value for the process, audit records will be more >> >> complete in systems with these properties. An example of where this >> >> is useful and applicable is in the realm of Android. With Android, >> >> their is no fork/exec for VM instances. The bare, preloaded Dalvik >> >> VM listens for a fork and specialize request. When this request comes >> >> in, the VM forks, and the loads the specific application (specializing). >> >> This was done to take advantage of COW and to not require a load of >> >> basic packages by the VM on very app spawn. When this spawn occurs, >> >> the package name is set via setproctitle() and shows up in procfs. >> >> Many of these package names are longer then 16 bytes, the historical >> >> width of task->comm. Having the cmdline in the audit records will >> >> couple the application back to the record directly. Also, on my >> >> Debian development box, some audit records were more useful then >> >> what was printed under comm. >> >> >> >> The cached cmdline is tied to the life-cycle of the audit_context >> >> structure and is built on demand. >> > >> > I don't think its a good idea to do this for a number of reasons. >> > 1) don't we have a record type for command line and its arguments? >> > Shouldn't we use that auxiliary record if we do this? >> >> Doing this in userspace means each and every user-space would have to be >> patched to support this. Other people from various systems have jumped in >> adding how this would be beneficial to their cause. The data is right here in >> the kernel. > > I don't mean doing it in user space, I was thinking of perhaps using the > EXECVE auxiliary record type. It looks something like this: > > type=EXECVE msg=audit(1303335094.212:83): argc=2 a0="ping" > a1="koji.fedoraproject.org" > > Its a record type we already have with a format that can be parsed. > Their is no execve in my use case, so this record would never, ever be emitted. > >> > 2) we don't want each and every syscall record to grow huge(r). Remember >> > the command line can be virtually unlimited in length. Adding this will >> > consume disk space and we will be able to keep less records than we >> > currently do. >> We cap it at 128 chars in v3 patch, and then this value can be altered out >> of tree and tuned for various systems. > > That still adds up on systems where people really do use audit. Yes, but is less then setting comm width to 128, and its only transient use, not static and un yielding in its use. > > >> > 3) User space will now have to parse this field, too. If everything is in >> > 1 >> > field, how can you tell the command from its arguments considering the >> > command name could have spaces in it. What if the arguments have spaces >> > in them? >> >> How did bash figure this out to run the command? > > It was shell escaped and quoted when bash saw it. Its not when the kernel sees > it. > >> All the fields in audit are KVP based, the parsing is pretty straight >> forward. > > Try this, > > cp /bin/ls 'test test test' > auditctll -a always,exit -F arch=b64 -S stat -k test > ./test\ test\ test './test\ test\ test' > auditctl -D > ausearch --start recent --key test > > >> On the event of weird chars, it gets hex escaped. > > and its all in 1 lump with no escaping to figure out what is what. Un-escape it. ausearch does this with paths. Then if you need to parse it, do it. > > >> > Its far better to fix cmd to be bigger than 16 characters than add all >> > this >> > extra information that is not needed in the audit logs. >> >> Rather then use some transient noon-pageable kernel memory for this, >> you are suggesting using static, >> non-page-able kernel memory for the whole life of every process? What about >> cases where audit is disabled. This will greatly bloat the kernel. I >> have brought up cranking up the >> width but the general reaction is, this is not a good idea. > > That is what the problem is. 16 bytes is useless for anything. > Well I agree with that statement, its not going to change anytime soon. And also has the drawbacks ive mentioned. Also, their is another limitation. What if a thread sets its title. Its possible for each thread to have its own comm field. This cmdlien value ties it back to a global entity. Any thread can change it, but the value will be the same across all threads. > > >> >> Example denial prior to patch (Ubuntu): >> >> CALL msg=audit(1387828084.070:361): arch=c000003e syscall=82 success=yes >> >> exit=0 a0=4184bf a1=418547 a2=0 a3=0 items=0 ppid=1 pid=1329 >> >> auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 >> >> ses=4294967295 tty=(none) comm="console-kit-dae" >> >> exe="/usr/sbin/console-kit-daemon" >> >> subj=system_u:system_r:consolekit_t:s0-s0:c0.c255 key=(null) >> >> >> >> After Patches (Ubuntu): >> >> type=SYSCALL msg=audit(1387828084.070:361): arch=c000003e syscall=82 >> >> success=yes exit=0 a0=4184bf a1=418547 a2=0 a3=0 items=0 ppid=1 pid=1329 >> >> auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 >> >> ses=4294967295 tty=(none) comm="console-kit-dae" >> >> exe="/usr/sbin/console-kit-daemon" >> >> subj=system_u:system_r:consolekit_t:s0-s0:c0.c255 >> >> cmdline="/usr/lib/dbus-1.0/dbus-daemon-launch-helper" key=(null) >> >> >> >> Example denial prior to patch (Android): >> >> type=1300 msg=audit(248323.940:247): arch=40000028 syscall=54 per=840000 >> >> success=yes exit=0 a0=39 a1=540b a2=2 a3=750eecec items=0 ppid=224 >> >> pid=1858 >> >> auid=4294967295 uid=1002 gid=1002 euid=1002 suid=1002 fsuid=1002 >> >> egid=1002 >> >> sgid=1002 fsgid=1002 tty=(none) ses=4294967295 comm="bt_hc_worker" >> >> exe="/system/bin/app_process" subj=u:r:bluetooth:s0 key=(null) >> >> >> >> After Patches (Android): >> >> type=1300 msg=audit(248323.940:247): arch=40000028 syscall=54 per=840000 >> >> success=yes exit=0 a0=39 a1=540b a2=2 a3=750eecec items=0 ppid=224 >> >> pid=1858 >> >> auid=4294967295 uid=1002 gid=1002 euid=1002 suid=1002 fsuid=1002 >> >> egid=1002 >> >> sgid=1002 fsgid=1002 tty=(none) ses=4294967295 comm="bt_hc_worker" >> >> exe="/system/bin/app_process" cmdline="com.android.bluetooth" >> >> subj=u:r:bluetooth:s0 key=(null) >> >> >> >> Signed-off-by: William Roberts >> >> --- >> >> >> >> kernel/audit.h | 1 + >> >> kernel/auditsc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ >> >> 2 files changed, 47 insertions(+) >> >> >> >> diff --git a/kernel/audit.h b/kernel/audit.h >> >> index b779642..bd6211f 100644 >> >> --- a/kernel/audit.h >> >> +++ b/kernel/audit.h >> >> @@ -202,6 +202,7 @@ struct audit_context { >> >> >> >> } execve; >> >> >> >> }; >> >> int fds[2]; >> >> >> >> + char *cmdline; >> >> >> >> #if AUDIT_DEBUG >> >> >> >> int put_count; >> >> >> >> diff --git a/kernel/auditsc.c b/kernel/auditsc.c >> >> index 90594c9..cadee2b 100644 >> >> --- a/kernel/auditsc.c >> >> +++ b/kernel/auditsc.c >> >> @@ -79,6 +79,9 @@ >> >> >> >> /* no execve audit message should be longer than this (userspace limits) >> >> */ >> >> >> >> #define MAX_EXECVE_AUDIT_LEN 7500 >> >> >> >> +/* max length to print of cmdline value during audit */ >> >> +#define MAX_CMDLINE_AUDIT_LEN 128 >> >> + >> >> >> >> /* number of audit rules */ >> >> int audit_n_rules; >> >> >> >> @@ -842,6 +845,12 @@ static inline struct audit_context >> >> *audit_get_context(struct task_struct *tsk, return context; >> >> >> >> } >> >> >> >> +static inline void audit_cmdline_free(struct audit_context *context) >> >> +{ >> >> + kfree(context->cmdline); >> >> + context->cmdline = NULL; >> >> +} >> >> + >> >> >> >> static inline void audit_free_names(struct audit_context *context) >> >> { >> >> >> >> struct audit_names *n, *next; >> >> >> >> @@ -955,6 +964,7 @@ static inline void audit_free_context(struct >> >> audit_context *context) audit_free_aux(context); >> >> >> >> kfree(context->filterkey); >> >> kfree(context->sockaddr); >> >> >> >> + audit_cmdline_free(context); >> >> >> >> kfree(context); >> >> >> >> } >> >> >> >> @@ -1271,6 +1281,41 @@ static void show_special(struct audit_context >> >> *context, int *call_panic) audit_log_end(ab); >> >> >> >> } >> >> >> >> +static void audit_log_cmdline(struct audit_buffer *ab, struct >> >> task_struct >> >> *tsk, + struct audit_context *context) >> >> +{ >> >> + int res; >> >> + char *buf; >> >> + char *msg = "(null)"; >> >> + audit_log_format(ab, " cmdline="); >> >> + >> >> + /* Not cached */ >> >> + if (!context->cmdline) { >> >> + buf = kmalloc(MAX_CMDLINE_AUDIT_LEN, GFP_KERNEL); >> >> + if (!buf) >> >> + goto out; >> >> + res = get_cmdline(tsk, buf, MAX_CMDLINE_AUDIT_LEN); >> >> + if (res == 0) { >> >> + kfree(buf); >> >> + goto out; >> >> + } >> >> + /* >> >> + * Ensure NULL terminated but don't clobber the end >> >> + * unless the buffer is full. Worst case you end up >> >> + * with 2 null bytes ending it. By doing it this way >> >> + * one avoids additional branching. One checking if the >> >> + * end is null and another to check if their should be >> >> + * an increment before setting the null byte. >> >> + */ >> >> + res -= res == PATH_MAX; >> >> + buf[res] = '\0'; >> >> + context->cmdline = buf; >> >> + } >> >> + msg = context->cmdline; >> >> +out: >> >> + audit_log_untrustedstring(ab, msg); >> >> +} >> >> + >> >> >> >> static void audit_log_exit(struct audit_context *context, struct >> >> >> >> task_struct *tsk) { >> >> >> >> int i, call_panic = 0; >> >> >> >> @@ -1303,6 +1348,7 @@ static void audit_log_exit(struct audit_context >> >> *context, struct task_struct *ts >> >> >> >> audit_log_task_info(ab, tsk); >> >> audit_log_key(ab, context->filterkey); >> >> >> >> + audit_log_cmdline(ab, tsk, context); >> >> >> >> audit_log_end(ab); >> >> >> >> for (aux = context->aux; aux; aux = aux->next) { > -- Respectfully, William C Roberts -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/