Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b747172 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/eparis/audit 

Pull audit updates from Eric Paris.

* git://git.infradead.org/users/eparis/audit: (28 commits)
  AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC
  audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range
  audit: do not cast audit_rule_data pointers pointlesly
  AUDIT: Allow login in non-init namespaces
  audit: define audit_is_compat in kernel internal header
  kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c
  sched: declare pid_alive as inline
  audit: use uapi/linux/audit.h for AUDIT_ARCH declarations
  syscall_get_arch: remove useless function arguments
  audit: remove stray newline from audit_log_execve_info() audit_panic() call
  audit: remove stray newlines from audit_log_lost messages
  audit: include subject in login records
  audit: remove superfluous new- prefix in AUDIT_LOGIN messages
  audit: allow user processes to log from another PID namespace
  audit: anchor all pid references in the initial pid namespace
  audit: convert PPIDs to the inital PID namespace.
  pid: get pid_t ppid of task in init_pid_ns
  audit: rename the misleading audit_get_context() to audit_take_context()
  audit: Add generic compat syscall support
  audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL
  ...
parents b7e70ca9 312103d6

arch/alpha/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ config ALPHA 
	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select GENERIC_STRNLEN_USER

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_MOD_ARCH_SPECIFIC

	select MODULES_USE_ELF_RELA

	select MODULES_USE_ELF_RELA

	select ODD_RT_SIGACTION

	select ODD_RT_SIGACTION

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ config ARM 
	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select GENERIC_STRNLEN_USER

	select HARDIRQS_SW_RESEND

	select HARDIRQS_SW_RESEND

	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

arch/arm/include/asm/syscall.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ 
#ifndef _ASM_ARM_SYSCALL_H

#ifndef _ASM_ARM_SYSCALL_H

#define _ASM_ARM_SYSCALL_H

#define _ASM_ARM_SYSCALL_H





#include <linux/audit.h> /* for AUDIT_ARCH_* */

#include <uapi/linux/audit.h> /* for AUDIT_ARCH_* */

#include <linux/elf.h> /* for ELF_EM */

#include <linux/elf.h> /* for ELF_EM */

#include <linux/err.h>

#include <linux/err.h>

#include <linux/sched.h>

#include <linux/sched.h>
@@ -103,8 +103,7 @@ static inline void syscall_set_arguments(struct task_struct *task, 
	memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));

	memcpy(&regs->ARM_r0 + i, args, n * sizeof(args[0]));

}

}





static inline int syscall_get_arch(struct task_struct *task,

static inline int syscall_get_arch(void)

				   struct pt_regs *regs)

{

{

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

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

	return AUDIT_ARCH_ARM;

	return AUDIT_ARCH_ARM;

arch/ia64/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ config IA64 
	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_MOD_ARCH_SPECIFIC

	select MODULES_USE_ELF_RELA

	select MODULES_USE_ELF_RELA

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_CMPXCHG_LOCKREF

	select HAVE_ARCH_AUDITSYSCALL

	default y

	default y

	help

	help

	  The Itanium Processor Family is Intel's 64-bit successor to

	  The Itanium Processor Family is Intel's 64-bit successor to

arch/mips/include/asm/syscall.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define __ASM_MIPS_SYSCALL_H

#define __ASM_MIPS_SYSCALL_H





#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/audit.h>

#include <uapi/linux/audit.h>

#include <linux/elf-em.h>

#include <linux/elf-em.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/sched.h>
@@ -127,12 +127,11 @@ extern const unsigned long sys_call_table[]; 
extern const unsigned long sys32_call_table[];

extern const unsigned long sys32_call_table[];

extern const unsigned long sysn32_call_table[];

extern const unsigned long sysn32_call_table[];





static inline int syscall_get_arch(struct task_struct *task,

static inline int syscall_get_arch(void)

				   struct pt_regs *regs)

{

{

	int arch = EM_MIPS;

	int arch = EM_MIPS;

#ifdef CONFIG_64BIT

#ifdef CONFIG_64BIT

	if (!test_tsk_thread_flag(task, TIF_32BIT_REGS))

	if (!test_thread_flag(TIF_32BIT_REGS))

		arch |= __AUDIT_ARCH_64BIT;

		arch |= __AUDIT_ARCH_64BIT;

#endif

#endif

#if defined(__LITTLE_ENDIAN)

#if defined(__LITTLE_ENDIAN)