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

Commit bcc9f966 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha 

Pull alpha updates from Matt Turner:
 "A pair of changes for alpha.  One fixes a networking regression, and
  the second adds audit syscall support which will help in supporting
  systemd"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: fix broken network checksum
  alpha: Enable system-call auditing support.
parents b399c46e 0ef38d70

arch/alpha/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config ALPHA 
	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select AUDIT_ARCH

	select GENERIC_CLOCKEVENTS

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_STRNCPY_FROM_USER
@@ -77,6 +78,8 @@ config GENERIC_ISA_DMA 
source "init/Kconfig"

source "kernel/Kconfig.freezer"



config AUDIT_ARCH

	bool



menu "System setup"

arch/alpha/include/asm/ptrace.h

+5 −0
Original line number Diff line number Diff line
@@ -19,4 +19,9 @@ 


#define force_successful_syscall_return() (current_pt_regs()->r0 = 0)



static inline unsigned long regs_return_value(struct pt_regs *regs)

{

	return regs->r0;

}



#endif

arch/alpha/include/asm/thread_info.h

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define TIF_NOTIFY_RESUME	1	/* callback before returning to user */

#define TIF_SIGPENDING		2	/* signal pending */

#define TIF_NEED_RESCHED	3	/* rescheduling necessary */

#define TIF_SYSCALL_AUDIT	4	/* syscall audit active */

#define TIF_DIE_IF_KERNEL	9	/* dik recursion lock */

#define TIF_MEMDIE		13	/* is terminating due to OOM killer */
@@ -77,6 +78,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)



/* Work to do on interrupt/exception return.  */

#define _TIF_WORK_MASK		(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \

arch/alpha/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_SRM_ENV) += srm_env.o 
obj-$(CONFIG_MODULES)	+= module.o

obj-$(CONFIG_PERF_EVENTS) += perf_event.o

obj-$(CONFIG_RTC_DRV_ALPHA) += rtc.o

obj-$(CONFIG_AUDIT)	+= audit.o



ifdef CONFIG_ALPHA_GENERIC

arch/alpha/kernel/audit.c

0 → 100644
+60 −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

};



static unsigned signal_class[] = {

#include <asm-generic/audit_signal.h>

~0U

};



int audit_classify_arch(int arch)

{

	return 0;

}



int audit_classify_syscall(int abi, unsigned syscall)

{

	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)

{

	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);

	audit_register_class(AUDIT_CLASS_SIGNAL, signal_class);

	return 0;

}



__initcall(audit_classes_init);