History

Merge tag 'audit-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit

Pull audit updates from Paul Moore: "Another merge window, another small audit pull request. Four patches in total: one is cosmetic, one removes an unnecessary initialization, one renames some enum values to prevent name collisions, and one converts list_del()/list_add() to list_move(). None of these are earth shattering and all pass the audit-testsuite tests while merging cleanly on top of your tree from earlier today" * tag 'audit-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: audit: remove unnecessary 'ret' initialization audit: remove trailing spaces and tabs audit: Use list_move instead of list_del/list_add audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition audit: add blank line after variable declarations

Linus Torvalds committed 5 years ago

Commit 290fe0f2 parents 6bd344e 0ecc6175 files · +53 −37Browse files

Showing the changes to include/uapi (1 of 5 files). Show all

Unified · Split

include/uapi/linux/audit.h+2−2
@@ -48,7 +48,7 @@ · 47 unmodified lines
4848 * 2500 - 2999 future user space (maybe integrity labels and related events)
4949 *
5050 * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
51− * exclusively user space. 1300-2099 is kernel --> user space
51+ * exclusively user space. 1300-2099 is kernel --> user space
5252 * communication.
5353 */
5454 #define AUDIT_GET 1000 /* Get status */
@@ -78,7 +78,7 @@ · 23 unmodified lines
7878 #define AUDIT_LAST_USER_MSG 1199
7979 #define AUDIT_FIRST_USER_MSG2 2100 /* More user space messages */
8080 #define AUDIT_LAST_USER_MSG2 2999
81−
81+
8282 #define AUDIT_DAEMON_START 1200 /* Daemon startup record */
8383 #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */
8484 #define AUDIT_DAEMON_ABORT 1202 /* Daemon error stop record */