History

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

Pull audit updates from Paul Moore: "We've got a reasonably broad set of audit patches for the v5.2 merge window, the highlights are below: - The biggest change, and the source of all the arch/* changes, is the patchset from Dmitry to help enable some of the work he is doing around PTRACE_GET_SYSCALL_INFO. To be honest, including this in the audit tree is a bit of a stretch, but it does help move audit a little further along towards proper syscall auditing for all arches, and everyone else seemed to agree that audit was a "good" spot for this to land (or maybe they just didn't want to merge it? dunno.). - We can now audit time/NTP adjustments. - We continue the work to connect associated audit records into a single event" * tag 'audit-pr-20190507' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit: (21 commits) audit: fix a memory leak bug ntp: Audit NTP parameters adjustment timekeeping: Audit clock adjustments audit: purge unnecessary list_empty calls audit: link integrity evm_write_xattrs record to syscall event syscall_get_arch: add "struct task_struct *" argument unicore32: define syscall_get_arch() Move EM_UNICORE to uapi/linux/elf-em.h nios2: define syscall_get_arch() nds32: define syscall_get_arch() Move EM_NDS32 to uapi/linux/elf-em.h m68k: define syscall_get_arch() hexagon: define syscall_get_arch() Move EM_HEXAGON to uapi/linux/elf-em.h h8300: define syscall_get_arch() c6x: define syscall_get_arch() arc: define syscall_get_arch() Move EM_ARCOMPACT and EM_ARCV2 to uapi/linux/elf-em.h audit: Make audit_log_cap and audit_copy_inode static audit: connect LOGIN record to its syscall record ...

Linus Torvalds committed 7 years ago

Commit 02aff8d2 parents f72dae2 70c4cf143 files · +331 −107Browse files

Showing the changes to include/uapi/linux (2 of 43 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/audit.h +14 −0
  2. include/uapi/linux/elf-em.h +6 −0
include/uapi/linux/audit.h+14−0
@@ -114,6 +114,8 @@ · 113 unmodified lines
114114 #define AUDIT_REPLACE 1329 /* Replace auditd if this packet unanswerd */
115115 #define AUDIT_KERN_MODULE 1330 /* Kernel Module events */
116116 #define AUDIT_FANOTIFY 1331 /* Fanotify access decision */
117+#define AUDIT_TIME_INJOFFSET 1332 /* Timekeeping offset injected */
118+#define AUDIT_TIME_ADJNTPVAL 1333 /* NTP value adjustment */
117119
118120 #define AUDIT_AVC 1400 /* SE Linux avc denial or grant */
119121 #define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */
@@ -375,11 +377,19 @@ enum { · 255 unmodified lines
375377
376378 #define AUDIT_ARCH_AARCH64 (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
377379 #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
380+#define AUDIT_ARCH_ARCOMPACT (EM_ARCOMPACT|__AUDIT_ARCH_LE)
381+#define AUDIT_ARCH_ARCOMPACTBE (EM_ARCOMPACT)
382+#define AUDIT_ARCH_ARCV2 (EM_ARCV2|__AUDIT_ARCH_LE)
383+#define AUDIT_ARCH_ARCV2BE (EM_ARCV2)
378384 #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE)
379385 #define AUDIT_ARCH_ARMEB (EM_ARM)
386+#define AUDIT_ARCH_C6X (EM_TI_C6000|__AUDIT_ARCH_LE)
387+#define AUDIT_ARCH_C6XBE (EM_TI_C6000)
380388 #define AUDIT_ARCH_CRIS (EM_CRIS|__AUDIT_ARCH_LE)
381389 #define AUDIT_ARCH_CSKY (EM_CSKY|__AUDIT_ARCH_LE)
382390 #define AUDIT_ARCH_FRV (EM_FRV)
391+#define AUDIT_ARCH_H8300 (EM_H8_300)
392+#define AUDIT_ARCH_HEXAGON (EM_HEXAGON)
383393 #define AUDIT_ARCH_I386 (EM_386|__AUDIT_ARCH_LE)
384394 #define AUDIT_ARCH_IA64 (EM_IA_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
385395 #define AUDIT_ARCH_M32R (EM_M32R)
@@ -393,6 +403,9 @@ enum { · 7 unmodified lines
393403 #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
394404 #define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE|\
395405 __AUDIT_ARCH_CONVENTION_MIPS64_N32)
406+#define AUDIT_ARCH_NDS32 (EM_NDS32|__AUDIT_ARCH_LE)
407+#define AUDIT_ARCH_NDS32BE (EM_NDS32)
408+#define AUDIT_ARCH_NIOS2 (EM_ALTERA_NIOS2|__AUDIT_ARCH_LE)
396409 #define AUDIT_ARCH_OPENRISC (EM_OPENRISC)
397410 #define AUDIT_ARCH_PARISC (EM_PARISC)
398411 #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT)
@@ -413,6 +426,7 @@ enum { · 14 unmodified lines
413426 #define AUDIT_ARCH_TILEGX (EM_TILEGX|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
414427 #define AUDIT_ARCH_TILEGX32 (EM_TILEGX|__AUDIT_ARCH_LE)
415428 #define AUDIT_ARCH_TILEPRO (EM_TILEPRO|__AUDIT_ARCH_LE)
429+#define AUDIT_ARCH_UNICORE (EM_UNICORE|__AUDIT_ARCH_LE)
416430 #define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
417431 #define AUDIT_ARCH_XTENSA (EM_XTENSA)
418432
include/uapi/linux/elf-em.h+6−0
@@ -34,14 +34,20 @@ · 33 unmodified lines
3434 #define EM_M32R 88 /* Renesas M32R */
3535 #define EM_MN10300 89 /* Panasonic/MEI MN10300, AM33 */
3636 #define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
37+#define EM_ARCOMPACT 93 /* ARCompact processor */
3738 #define EM_XTENSA 94 /* Tensilica Xtensa Architecture */
3839 #define EM_BLACKFIN 106 /* ADI Blackfin Processor */
40+#define EM_UNICORE 110 /* UniCore-32 */
3941 #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */
4042 #define EM_TI_C6000 140 /* TI C6X DSPs */
43+#define EM_HEXAGON 164 /* QUALCOMM Hexagon */
44+#define EM_NDS32 167 /* Andes Technology compact code size
45+ embedded RISC processor family */
4146 #define EM_AARCH64 183 /* ARM 64 bit */
4247 #define EM_TILEPRO 188 /* Tilera TILEPro */
4348 #define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
4449 #define EM_TILEGX 191 /* Tilera TILE-Gx */
50+#define EM_ARCV2 195 /* ARCv2 Cores */
4551 #define EM_RISCV 243 /* RISC-V */
4652 #define EM_BPF 247 /* Linux BPF - in-kernel virtual machine */
4753 #define EM_CSKY 252 /* C-SKY */