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

Commit 853da002 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current 

* 'audit.b38' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] Abnormal End of Processes
  [PATCH] match audit name data
  [PATCH] complete message queue auditing
  [PATCH] audit inode for all xattr syscalls
  [PATCH] initialize name osid
  [PATCH] audit signal recipients
  [PATCH] add SIGNAL syscall class (v3)
  [PATCH] auditing ptrace
parents 5884c406 0a4ff8c2

arch/ia64/ia32/audit.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,11 @@ unsigned ia32_read_class[] = { 
~0U

~0U

};

};





unsigned ia32_signal_class[] = {

#include <asm-generic/audit_signal.h>

~0U

};



int ia32_classify_syscall(unsigned syscall)

int ia32_classify_syscall(unsigned syscall)

{

{

	switch(syscall) {

	switch(syscall) {

arch/ia64/kernel/audit.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = { 
~0U

~0U

};

};





static unsigned signal_class[] = {

#include <asm-generic/audit_signal.h>

~0U

};



int audit_classify_arch(int arch)

{

#ifdef CONFIG_IA32_SUPPORT

	if (arch == AUDIT_ARCH_I386)

		return 1;

#endif

	return 0;

}



int audit_classify_syscall(int abi, unsigned syscall)

int audit_classify_syscall(int abi, unsigned syscall)

{

{

#ifdef CONFIG_IA32_SUPPORT

#ifdef CONFIG_IA32_SUPPORT
@@ -49,15 +63,18 @@ static int __init audit_classes_init(void) 
	extern __u32 ia32_write_class[];

	extern __u32 ia32_write_class[];

	extern __u32 ia32_read_class[];

	extern __u32 ia32_read_class[];

	extern __u32 ia32_chattr_class[];

	extern __u32 ia32_chattr_class[];

	extern __u32 ia32_signal_class[];

	audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);

	audit_register_class(AUDIT_CLASS_WRITE_32, ia32_write_class);

	audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);

	audit_register_class(AUDIT_CLASS_READ_32, ia32_read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ia32_dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL_32, ia32_signal_class);

#endif

#endif

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);

	return 0;

	return 0;

}

}

arch/powerpc/kernel/audit.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = { 
~0U

~0U

};

};





static unsigned signal_class[] = {

#include <asm-generic/audit_signal.h>

~0U

};



int audit_classify_arch(int arch)

{

#ifdef CONFIG_PPC64

	if (arch == AUDIT_ARCH_PPC)

		return 1;

#endif

	return 0;

}



int audit_classify_syscall(int abi, unsigned syscall)

int audit_classify_syscall(int abi, unsigned syscall)

{

{

#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC64
@@ -51,15 +65,18 @@ static int __init audit_classes_init(void) 
	extern __u32 ppc32_write_class[];

	extern __u32 ppc32_write_class[];

	extern __u32 ppc32_read_class[];

	extern __u32 ppc32_read_class[];

	extern __u32 ppc32_chattr_class[];

	extern __u32 ppc32_chattr_class[];

	extern __u32 ppc32_signal_class[];

	audit_register_class(AUDIT_CLASS_WRITE_32, ppc32_write_class);

	audit_register_class(AUDIT_CLASS_WRITE_32, ppc32_write_class);

	audit_register_class(AUDIT_CLASS_READ_32, ppc32_read_class);

	audit_register_class(AUDIT_CLASS_READ_32, ppc32_read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ppc32_dir_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, ppc32_dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL_32, ppc32_signal_class);

#endif

#endif

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);

	return 0;

	return 0;

}

}

arch/powerpc/kernel/compat_audit.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,11 @@ unsigned ppc32_read_class[] = { 
~0U

~0U

};

};





unsigned ppc32_signal_class[] = {

#include <asm-generic/audit_signal.h>

~0U

};



int ppc32_classify_syscall(unsigned syscall)

int ppc32_classify_syscall(unsigned syscall)

{

{

	switch(syscall) {

	switch(syscall) {

arch/s390/kernel/audit.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,20 @@ static unsigned chattr_class[] = { 
~0U

~0U

};

};





static unsigned signal_class[] = {

#include <asm-generic/audit_signal.h>

~0U

};



int audit_classify_arch(int arch)

{

#ifdef CONFIG_COMPAT

	if (arch == AUDIT_ARCH_S390)

		return 1;

#endif

	return 0;

}



int audit_classify_syscall(int abi, unsigned syscall)

int audit_classify_syscall(int abi, unsigned syscall)

{

{

#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT
@@ -51,15 +65,18 @@ static int __init audit_classes_init(void) 
	extern __u32 s390_write_class[];

	extern __u32 s390_write_class[];

	extern __u32 s390_read_class[];

	extern __u32 s390_read_class[];

	extern __u32 s390_chattr_class[];

	extern __u32 s390_chattr_class[];

	extern __u32 s390_signal_class[];

	audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class);

	audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class);

	audit_register_class(AUDIT_CLASS_READ_32, s390_read_class);

	audit_register_class(AUDIT_CLASS_READ_32, s390_read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, s390_chattr_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, s390_chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL_32, s390_signal_class);

#endif

#endif

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);

	return 0;

	return 0;

}

}