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

Commit 05ff0e29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'audit.b28' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] audit: AUDIT_PERM support
  [PATCH] audit: more syscall classes added
  [PATCH] syscall classes hookup for ppc and s390
  [PATCH] update audit rule change messages
  [PATCH] sanity check audit_buffer
  [PATCH] fix ppid bug in 2.6.18 kernel
parents 5eea7ee2 55669bfa

arch/i386/kernel/audit.c

+28 −0
Original line number Diff line number Diff line
@@ -8,13 +8,41 @@ static unsigned dir_class[] = { 
~0U

};



static unsigned read_class[] = {

#include <asm-generic/audit_read.h>

~0U

};



static unsigned write_class[] = {

#include <asm-generic/audit_write.h>

~0U

};



static unsigned chattr_class[] = {

#include <asm-generic/audit_change_attr.h>

~0U

};



int audit_classify_syscall(int abi, unsigned syscall)

{

	switch(syscall) {

	case __NR_open:

		return 2;

	case __NR_openat:

		return 3;

	case __NR_socketcall:

		return 4;

	case __NR_execve:

		return 5;

	default:

		return 0;

	}

}



static int __init audit_classes_init(void)

{

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	return 0;

arch/ia64/ia32/audit.c

+26 −0
Original line number Diff line number Diff line
@@ -9,3 +9,29 @@ unsigned ia32_chattr_class[] = { 
#include <asm-generic/audit_change_attr.h>

~0U

};



unsigned ia32_write_class[] = {

#include <asm-generic/audit_write.h>

~0U

};



unsigned ia32_read_class[] = {

#include <asm-generic/audit_read.h>

~0U

};



int ia32_classify_syscall(unsigned syscall)

{

	switch(syscall) {

	case __NR_open:

		return 2;

	case __NR_openat:

		return 3;

	case __NR_socketcall:

		return 4;

	case __NR_execve:

		return 5;

	default:

		return 1;

	}

}

arch/ia64/kernel/audit.c

+35 −0
Original line number Diff line number Diff line
@@ -8,19 +8,54 @@ static unsigned dir_class[] = { 
~0U

};



static unsigned read_class[] = {

#include <asm-generic/audit_read.h>

~0U

};



static unsigned write_class[] = {

#include <asm-generic/audit_write.h>

~0U

};



static unsigned chattr_class[] = {

#include <asm-generic/audit_change_attr.h>

~0U

};



int audit_classify_syscall(int abi, unsigned syscall)

{

#ifdef CONFIG_IA32_SUPPORT

	extern int ia32_classify_syscall(unsigned);

	if (abi == AUDIT_ARCH_I386)

		return ia32_classify_syscall(syscall);

#endif

	switch(syscall) {

	case __NR_open:

		return 2;

	case __NR_openat:

		return 3;

	case __NR_execve:

		return 5;

	default:

		return 0;

	}

}



static int __init audit_classes_init(void)

{

#ifdef CONFIG_IA32_SUPPORT

	extern __u32 ia32_dir_class[];

	extern __u32 ia32_write_class[];

	extern __u32 ia32_read_class[];

	extern __u32 ia32_chattr_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_DIR_WRITE_32, ia32_dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, ia32_chattr_class);

#endif

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	return 0;

arch/powerpc/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ obj-$(CONFIG_PCI) += $(pci64-y) $(pci32-y) 
kexec-$(CONFIG_PPC64)		:= machine_kexec_64.o

kexec-$(CONFIG_PPC32)		:= machine_kexec_32.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o $(kexec-y)

obj-$(CONFIG_AUDIT)		+= audit.o

obj64-$(CONFIG_AUDIT)		+= compat_audit.o



ifeq ($(CONFIG_PPC_ISERIES),y)

$(obj)/head_64.o: $(obj)/lparmap.s

arch/powerpc/kernel/audit.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/audit.h>

#include <asm/unistd.h>



static unsigned dir_class[] = {

#include <asm-generic/audit_dir_write.h>

~0U

};



static unsigned read_class[] = {

#include <asm-generic/audit_read.h>

~0U

};



static unsigned write_class[] = {

#include <asm-generic/audit_write.h>

~0U

};



static unsigned chattr_class[] = {

#include <asm-generic/audit_change_attr.h>

~0U

};



int audit_classify_syscall(int abi, unsigned syscall)

{

#ifdef CONFIG_PPC64

	extern int ppc32_classify_syscall(unsigned);

	if (abi == AUDIT_ARCH_PPC)

		return ppc32_classify_syscall(syscall);

#endif

	switch(syscall) {

	case __NR_open:

		return 2;

	case __NR_openat:

		return 3;

	case __NR_socketcall:

		return 4;

	case __NR_execve:

		return 5;

	default:

		return 0;

	}

}



static int __init audit_classes_init(void)

{

#ifdef CONFIG_PPC64

	extern __u32 ppc32_dir_class[];

	extern __u32 ppc32_write_class[];

	extern __u32 ppc32_read_class[];

	extern __u32 ppc32_chattr_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_DIR_WRITE_32, ppc32_dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR_32, ppc32_chattr_class);

#endif

	audit_register_class(AUDIT_CLASS_WRITE, write_class);

	audit_register_class(AUDIT_CLASS_READ, read_class);

	audit_register_class(AUDIT_CLASS_DIR_WRITE, dir_class);

	audit_register_class(AUDIT_CLASS_CHATTR, chattr_class);

	return 0;

}



__initcall(audit_classes_init);