author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 21 Feb 2017 21:25:50 +0000 (13:25 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 21 Feb 2017 21:25:50 +0000 (13:25 -0800) |
Pull audit updates from Paul Moore:
"The audit changes for v4.11 are relatively small compared to what we
did for v4.10, both in terms of size and impact.
- two patches from Steve tweak the formatting for some of the audit
records to make them more consistent with other audit records.
- three patches from Richard record the name of a module on module
load, fix the logging of sockaddr information when using
socketcall() on 32-bit systems, and add the ability to reset
audit's lost record counter.
- my lone patch just fixes an annoying style nit that I was reminded
about by one of Richard's patches.
All these patches pass our test suite"
* 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
audit: remove unnecessary curly braces from switch/case statements
audit: log module name on init_module
audit: log 32-bit socketcalls
audit: add feature audit_lost reset
audit: Make AUDIT_ANOM_ABEND event normalized
audit: Make AUDIT_KERNEL event conform to the specification
"The audit changes for v4.11 are relatively small compared to what we
did for v4.10, both in terms of size and impact.
- two patches from Steve tweak the formatting for some of the audit
records to make them more consistent with other audit records.
- three patches from Richard record the name of a module on module
load, fix the logging of sockaddr information when using
socketcall() on 32-bit systems, and add the ability to reset
audit's lost record counter.
- my lone patch just fixes an annoying style nit that I was reminded
about by one of Richard's patches.
All these patches pass our test suite"
* 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
audit: remove unnecessary curly braces from switch/case statements
audit: log module name on init_module
audit: log 32-bit socketcalls
audit: add feature audit_lost reset
audit: Make AUDIT_ANOM_ABEND event normalized
audit: Make AUDIT_KERNEL event conform to the specification
1 | 2 | |||
---|---|---|---|---|
include/linux/audit.h | patch | | diff1 | | diff2 | | blob | history |
include/uapi/linux/audit.h | patch | | diff1 | | diff2 | | blob | history |
kernel/audit.c | patch | | diff1 | | diff2 | | blob | history |
kernel/audit.h | patch | | diff1 | | diff2 | | blob | history |
kernel/auditsc.c | patch | | diff1 | | diff2 | | blob | history |
kernel/module.c | patch | | diff1 | | diff2 | | blob | history |
net/compat.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc include/linux/audit.h
Simple merge
diff --cc include/uapi/linux/audit.h
index 1c107cb1c83f80236cac0234a456d665bb9b7a15,3c02bb2ff779d2e3a313bb5eadf3a43e029aa814..0714a66f0e0cd6018758d991163b1de1f6326dd2
#define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT 0x00000001
#define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME 0x00000002
#define AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH 0x00000004
+#define AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND 0x00000008
#define AUDIT_FEATURE_BITMAP_SESSIONID_FILTER 0x00000010
+ #define AUDIT_FEATURE_BITMAP_LOST_RESET 0x00000020
+
#define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \
AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME | \
AUDIT_FEATURE_BITMAP_EXECUTABLE_PATH | \
- AUDIT_FEATURE_BITMAP_SESSIONID_FILTER)
+ AUDIT_FEATURE_BITMAP_EXCLUDE_EXTEND | \
+ AUDIT_FEATURE_BITMAP_SESSIONID_FILTER | \
+ AUDIT_FEATURE_BITMAP_LOST_RESET)
/* deprecated: AUDIT_VERSION_* */
#define AUDIT_VERSION_LATEST AUDIT_FEATURE_BITMAP_ALL
diff --cc kernel/audit.c
Simple merge
diff --cc kernel/audit.h
Simple merge
diff --cc kernel/auditsc.c
Simple merge
diff --cc kernel/module.c
Simple merge
diff --cc net/compat.c
Simple merge