On 2019-01-03 10:58, Guenter Roeck wrote: > Hi Richard, > > On Thu, Jan 03, 2019 at 12:36:13PM -0500, Richard Guy Briggs wrote: > > On 2019-01-03 08:15, Guenter Roeck wrote: > > > Hi, > > > > > > On Tue, Jul 31, 2018 at 04:07:35PM -0400, Richard Guy Briggs wrote: > > > > Implement kernel audit container identifier. > > > > > > I don't see a follow-up submission of this patch series. Has it been abandoned, > > > or do I use the wrong search terms ? > > > > Guenter, thanks for your interest in this patchset. I haven't > > abandoned it. I've pushed some updates to my own (ill-publicized) > > public git repo. This effort has been going on more than 5 years with 8 > > Oh man :-(. Not sure if I would be that patient. Patience, subbornness, unjustified optimism, tenacity, inflexibility, who knows... Are you talking about sticking with this particular problem, or delay before checking in on a particular patch review? > Can you point me to your repository ? Sure. It hasn't been squashed and will be rebased. git://toccata2.tricolour.ca/linux-2.6-rgb.git I still have some write locks to check and work on. > > previous revisions trying to document task namespaces and deciding that > > was insufficient. > > My interest is mostly thanks to having some of the patches of your series > in my incoming code review queue: > > https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1379654/3 Ok, interesting. Michael Halcrow had approached me in Vancouver at LSS at the end of August and I regret not having had enough time to talk with him further about it. > As background, some of the patches in the series are needed by GCP (Google > Cloud Platform) as a prerequisite for some security features. Having to > maintain out-of-tree code is always a pain, even more so in a subsystem > related to security. So it would be quite useful to understand if we are > going to be stuck with this forever or if there is a change for the code > to find its way upstream. Also, it would be useful to know if there are > some upcoming changes/improvements which should be included in our version. There are likely more changes coming, but I don't expect them to be that drastic a departure from the original design. There were some changes in the implementation based on unforseen issues raised once coding started (which is part of the process). Upstream patch review would be the most helpful in keeping this stuff moving. David Howells also had some interesting ideas and patches to try to address some of these problems and he's still working on a prerequisite patchset to get it upstream before returning to his container identifier patchset. It is moving slowly. > Thanks, > Guenter > > > For this patchset I waited 11.5 weeks (80 days, Jules Verne anyone?) > > before the primary intended maintainer did the first review, then I > > responded within 2 weeks with further questions and a followup patch > > proposal and then waited another 8 weeks for any response before adding > > another query for that followup patch proposal review at which point I > > got a rude answer saying I had disappointed and exhausted the > > maintainer's goodwill with some hints at how to proceed just before new > > year's. > > > > I'd be delighted with other upstream review to get other angles and to > > take some of the load and responsibility off the primary maintainer. > > > > I expect to submit a v5 within a week without having had those questions > > directly answered, but with some ideas of what to check and verify > > before I resubmit. Most of the changes have been sitting in that branch > > for two months, already rebased one kernel version and will need > > updating again. > > > > > Thanks, > > > Guenter > > > > > > > This patchset is a fourth based on the proposal document (V3) > > > > posted: > > > > https://www.redhat.com/archives/linux-audit/2018-January/msg00014.html > > > > > > > > The first patch is the last patch from ghak81 that is included here as a > > > > convenience. > > > > > > > > The second patch implements the proc fs write to set the audit container > > > > identifier of a process, emitting an AUDIT_CONTAINER_OP record to announce the > > > > registration of that audit container identifier on that process. This patch > > > > requires userspace support for record acceptance and proper type > > > > display. > > > > > > > > The third implements the auxiliary record AUDIT_CONTAINER if an > > > > audit container identifier is identifiable with an event. This patch > > > > requires userspace support for proper type display. > > > > > > > > The 4th adds signal and ptrace support. > > > > > > > > The 5th creates a local audit context to be able to bind a standalone > > > > record with a locally created auxiliary record. > > > > > > > > The 6th patch adds audit container identifier records to the tty > > > > standalone record. > > > > > > > > The 7th adds audit container identifier filtering to the exit, > > > > exclude and user lists. This patch adds the AUDIT_CONTID field and > > > > requires auditctl userspace support for the --contid option. > > > > > > > > The 8th adds network namespace audit container identifier labelling > > > > based on member tasks' audit container identifier labels. > > > > > > > > The 9th adds audit container identifier support to standalone netfilter > > > > records that don't have a task context and lists each container to which > > > > that net namespace belongs. > > > > > > > > The 10th implements reading the audit container identifier from the proc > > > > filesystem for debugging. This patch isn't planned for upstream > > > > inclusion. > > > > > > > > > > > > Example: Set an audit container identifier of 123456 to the "sleep" task: > > > > > > > > sleep 2& > > > > child=$! > > > > echo 123456 > /proc/$child/audit_containerid; echo $? > > > > ausearch -ts recent -m container > > > > echo child:$child contid:$( cat /proc/$child/audit_containerid) > > > > > > > > This should produce a record such as: > > > > > > > > type=CONTAINER_OP msg=audit(2018-06-06 12:39:29.636:26949) : op=set opid=2209 old-contid=18446744073709551615 contid=123456 pid=628 auid=root uid=root tty=ttyS0 ses=1 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 comm=bash exe=/usr/bin/bash res=yes > > > > > > > > > > > > Example: Set a filter on an audit container identifier 123459 on /tmp/tmpcontainerid: > > > > > > > > contid=123459 > > > > key=tmpcontainerid > > > > auditctl -a exit,always -F dir=/tmp -F perm=wa -F contid=$contid -F key=$key > > > > perl -e "sleep 1; open(my \$tmpfile, '>', \"/tmp/$key\"); close(\$tmpfile);" & > > > > child=$! > > > > echo $contid > /proc/$child/audit_containerid > > > > sleep 2 > > > > ausearch -i -ts recent -k $key > > > > auditctl -d exit,always -F dir=/tmp -F perm=wa -F contid=$contid -F key=$key > > > > rm -f /tmp/$key > > > > > > > > This should produce an event such as: > > > > > > > > type=CONTAINER msg=audit(2018-06-06 12:46:31.707:26953) : op=task contid=123459 > > > > type=PROCTITLE msg=audit(2018-06-06 12:46:31.707:26953) : proctitle=perl -e sleep 1; open(my $tmpfile, '>', "/tmp/tmpcontainerid"); close($tmpfile); > > > > type=PATH msg=audit(2018-06-06 12:46:31.707:26953) : item=1 name=/tmp/tmpcontainerid inode=25656 dev=00:26 mode=file,644 ouid=root ogid=root rdev=00:00 obj=unconfined_u:object_r:user_tmp_t:s0 nametype=CREATE cap_fp=none cap_fi=none cap_fe=0 cap_fver=0 > > > > type=PATH msg=audit(2018-06-06 12:46:31.707:26953) : item=0 name=/tmp/ inode=8985 dev=00:26 mode=dir,sticky,777 ouid=root ogid=root rdev=00:00 obj=system_u:object_r:tmp_t:s0 nametype=PARENT cap_fp=none cap_fi=none cap_fe=0 cap_fver=0 > > > > type=CWD msg=audit(2018-06-06 12:46:31.707:26953) : cwd=/root > > > > type=SYSCALL msg=audit(2018-06-06 12:46:31.707:26953) : arch=x86_64 syscall=openat success=yes exit=3 a0=0xffffffffffffff9c a1=0x5621f2b81900 a2=O_WRONLY|O_CREAT|O_TRUNC a3=0x1b6 items=2 ppid=628 pid=2232 auid=root uid=root gid=root euid=root suid=root fsuid=root egid=root sgid=root fsgid=root tty=ttyS0 ses=1 comm=perl exe=/usr/bin/perl subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 key=tmpcontainerid > > > > > > > > > > > > Includes: https://github.com/linux-audit/audit-kernel/issues/81 > > > > See: https://github.com/linux-audit/audit-kernel/issues/90 > > > > See: https://github.com/linux-audit/audit-userspace/issues/40 > > > > See: https://github.com/linux-audit/audit-testsuite/issues/64 > > > > See: https://github.com/linux-audit/audit-kernel/wiki/RFE-Audit-Container-ID > > > > > > > > Changelog: > > > > > > > > v4 > > > > - preface set with ghak81:"collect audit task parameters" > > > > - add shallyn and sgrubb acks > > > > - rename feature bitmap macro > > > > - rename cid_valid() to audit_contid_valid() > > > > - rename AUDIT_CONTAINER_ID to AUDIT_CONTAINER_OP > > > > - delete audit_get_contid_list() from headers > > > > - move work into inner if, delete "found" > > > > - change netns contid list function names > > > > - move exports for audit_log_contid audit_alloc_local audit_free_context to non-syscall patch > > > > - list contids CSV > > > > - pass in gfp flags to audit_alloc_local() (fix audit_alloc_context callers) > > > > - use "local" in lieu of abusing in_syscall for auditsc_get_stamp() > > > > - read_lock(&tasklist_lock) around children and thread check > > > > - task_lock(tsk) should be taken before first check of tsk->audit > > > > - add spin lock to contid list in aunet > > > > - restrict /proc read to CAP_AUDIT_CONTROL > > > > - remove set again prohibition and inherited flag > > > > - delete contidion spelling fix from patchset, send to netdev/linux-wireless > > > > > > > > v3 > > > > - switched from containerid in task_struct to audit_task_info (depends on ghak81) > > > > - drop INVALID_CID in favour of only AUDIT_CID_UNSET > > > > - check for !audit_task_info, throw -ENOPROTOOPT on set > > > > - changed -EPERM to -EEXIST for parent check > > > > - return AUDIT_CID_UNSET if !audit_enabled > > > > - squash child/thread check patch into AUDIT_CONTAINER_ID patch > > > > - changed -EPERM to -EBUSY for child check > > > > - separate child and thread checks, use -EALREADY for latter > > > > - move addition of op= from ptrace/signal patch to AUDIT_CONTAINER patch > > > > - fix && to || bashism in ptrace/signal patch > > > > - uninline and export function for audit_free_context() > > > > - drop CONFIG_CHANGE, FEATURE_CHANGE, ANOM_ABEND, ANOM_SECCOMP patches > > > > - move audit_enabled check (xt_AUDIT) > > > > - switched from containerid list in struct net to net_generic's struct audit_net > > > > - move containerid list iteration into audit (xt_AUDIT) > > > > - create function to move namespace switch into audit > > > > - switched /proc/PID/ entry from containerid to audit_containerid > > > > - call kzalloc with GFP_ATOMIC on in_atomic() in audit_alloc_context() > > > > - call kzalloc with GFP_ATOMIC on in_atomic() in audit_log_container_info() > > > > - use xt_net(par) instead of sock_net(skb->sk) to get net > > > > - switched record and field names: initial CONTAINER_ID, aux CONTAINER, field CONTID > > > > - allow to set own contid > > > > - open code audit_set_containerid > > > > - add contid inherited flag > > > > - ccontainerid and pcontainerid eliminated due to inherited flag > > > > - change name of container list funcitons > > > > - rename containerid to contid > > > > - convert initial container record to syscall aux > > > > - fix spelling mistake of contidion in net/rfkill/core.c to avoid contid name collision > > > > > > > > v2 > > > > - add check for children and threads > > > > - add network namespace container identifier list > > > > - add NETFILTER_PKT audit container identifier logging > > > > - patch description and documentation clean-up and example > > > > - reap unused ppid > > > > > > > > Richard Guy Briggs (10): > > > > audit: collect audit task parameters > > > > audit: add container id > > > > audit: log container info of syscalls > > > > audit: add containerid support for ptrace and signals > > > > audit: add support for non-syscall auxiliary records > > > > audit: add containerid support for tty_audit > > > > audit: add containerid filtering > > > > audit: add support for containerid to network namespaces > > > > audit: NETFILTER_PKT: record each container ID associated with a netNS > > > > debug audit: read container ID of a process > > > > > > > > drivers/tty/tty_audit.c | 5 +- > > > > fs/proc/base.c | 56 ++++++++++++++ > > > > include/linux/audit.h | 95 ++++++++++++++++++++--- > > > > include/linux/sched.h | 5 +- > > > > include/uapi/linux/audit.h | 8 +- > > > > init/init_task.c | 3 +- > > > > init/main.c | 2 + > > > > kernel/audit.c | 137 +++++++++++++++++++++++++++++++++ > > > > kernel/audit.h | 4 + > > > > kernel/auditfilter.c | 47 ++++++++++++ > > > > kernel/auditsc.c | 183 ++++++++++++++++++++++++++++++++++++++++----- > > > > kernel/fork.c | 4 +- > > > > kernel/nsproxy.c | 4 + > > > > net/netfilter/xt_AUDIT.c | 12 ++- > > > > 14 files changed, 526 insertions(+), 39 deletions(-) > > > > > > > > -- > > > > 1.8.3.1 > > > > > > > > - RGB > > > > -- > > Richard Guy Briggs <rgb@xxxxxxxxxx> > > Sr. S/W Engineer, Kernel Security, Base Operating Systems > > Remote, Ottawa, Red Hat Canada > > IRC: rgb, SunRaycer > > Voice: +1.647.777.2635, Internal: (81) 32635 - RGB -- Richard Guy Briggs <rgb@xxxxxxxxxx> Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada IRC: rgb, SunRaycer Voice: +1.647.777.2635, Internal: (81) 32635
