diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 11:24:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 11:24:05 -0700 |
commit | 7391786a64dcfe9c609a1f8e2204c1abf42ded23 (patch) | |
tree | aca7c97afa2e47d0e60703bb72730067139f8257 /security/apparmor/lsm.c | |
parent | eed1fc87795362fd868bdc960d7b96d25f81eae3 (diff) | |
parent | cd33f5f2cbfaadc21270f3ddac7c3c33e0a1a28c (diff) | |
download | talos-obmc-linux-7391786a64dcfe9c609a1f8e2204c1abf42ded23.tar.gz talos-obmc-linux-7391786a64dcfe9c609a1f8e2204c1abf42ded23.zip |
Merge branch 'stable-4.13' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
"Things are relatively quiet on the audit front for v4.13, just five
patches for a total diffstat of 102 lines.
There are two patches from Richard to consistently record the POSIX
capabilities and add the ambient capability information as well.
I also chipped in two patches to fix a race condition with the auditd
tracking code and ensure we don't skip sending any records to the
audit multicast group.
Finally a single style fix that I accepted because I must have been in
a good mood that day.
Everything passes our test suite, and should be relatively harmless,
please merge for v4.13"
* 'stable-4.13' of git://git.infradead.org/users/pcmoore/audit:
audit: make sure we never skip the multicast broadcast
audit: fix a race condition with the auditd tracking code
audit: style fix
audit: add ambient capabilities to CAPSET and BPRM_FCAPS records
audit: unswing cap_* fields in PATH records
Diffstat (limited to 'security/apparmor/lsm.c')
0 files changed, 0 insertions, 0 deletions