Commit 02aff8db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents f72dae20 70c4cf17

arch/alpha/include/asm/syscall.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <uapi/linux/audit.h>



static inline int syscall_get_arch(void)

static inline int syscall_get_arch(struct task_struct *task)

{

	return AUDIT_ARCH_ALPHA;

}

arch/arc/include/asm/elf.h

+1 −5
Original line number Diff line number Diff line
@@ -10,13 +10,9 @@ 
#define __ASM_ARC_ELF_H



#include <linux/types.h>

#include <linux/elf-em.h>

#include <uapi/asm/elf.h>



/* These ELF defines belong to uapi but libc elf.h already defines them */

#define EM_ARCOMPACT		93



#define EM_ARCV2		195	/* ARCv2 Cores */



#define EM_ARC_INUSE		(IS_ENABLED(CONFIG_ISA_ARCOMPACT) ? \

					EM_ARCOMPACT : EM_ARCV2)

arch/arc/include/asm/syscall.h

+11 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#ifndef _ASM_ARC_SYSCALL_H

#define _ASM_ARC_SYSCALL_H  1



#include <uapi/linux/audit.h>

#include <linux/err.h>

#include <linux/sched.h>

#include <asm/unistd.h>
@@ -67,4 +68,14 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, 
	}

}



static inline int

syscall_get_arch(struct task_struct *task)

{

	return IS_ENABLED(CONFIG_ISA_ARCOMPACT)

		? (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)

			? AUDIT_ARCH_ARCOMPACTBE : AUDIT_ARCH_ARCOMPACT)

		: (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)

			? AUDIT_ARCH_ARCV2BE : AUDIT_ARCH_ARCV2);

}



#endif

arch/arm/include/asm/syscall.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	memcpy(&regs->ARM_r0 + 1, args, 5 * sizeof(args[0]));

}



static inline int syscall_get_arch(void)

static inline int syscall_get_arch(struct task_struct *task)

{

	/* ARM tasks don't change audit architectures on the fly. */

	return AUDIT_ARCH_ARM;

arch/arm64/include/asm/syscall.h

+2 −2
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ static inline void syscall_set_arguments(struct task_struct *task, 
 * We don't care about endianness (__AUDIT_ARCH_LE bit) here because

 * AArch64 has the same system calls both on little- and big- endian.

 */

static inline int syscall_get_arch(void)

static inline int syscall_get_arch(struct task_struct *task)

{

	if (is_compat_task())

	if (is_compat_thread(task_thread_info(task)))

		return AUDIT_ARCH_ARM;



	return AUDIT_ARCH_AARCH64;

CRA Git | Maintained and supported by SUSTech CRA and CCSE