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

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)
  audit: no leading space in audit_log_d_path prefix
  audit: treat s_id as an untrusted string
  audit: fix signedness bug in audit_log_execve_info()
  audit: comparison on interprocess fields
  audit: implement all object interfield comparisons
  audit: allow interfield comparison between gid and ogid
  audit: complex interfield comparison helper
  audit: allow interfield comparison in audit rules
  Kernel: Audit Support For The ARM Platform
  audit: do not call audit_getname on error
  audit: only allow tasks to set their loginuid if it is -1
  audit: remove task argument to audit_set_loginuid
  audit: allow audit matching on inode gid
  audit: allow matching on obj_uid
  audit: remove audit_finish_fork as it can't be called
  audit: reject entry,always rules
  audit: inline audit_free to simplify the look of generic code
  audit: drop audit_set_macxattr as it doesn't do anything
  audit: inline checks for not needing to collect aux records
  audit: drop some potentially inadvisable likely notations
  ...

Use evil merge to fix up grammar mistakes in Kconfig file.

Bad speling and horrible grammar (and copious swearing) is to be
expected, but let's keep it to commit messages and comments, rather than
expose it to users in config help texts or printouts.
parents 22b4eb5e c158a35c

arch/arm/include/asm/kprobes.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define MAX_INSN_SIZE			2

#define MAX_STACK_SIZE			64	/* 32 would probably be OK */



#define regs_return_value(regs)		((regs)->ARM_r0)

#define flush_insn_slot(p)		do { } while (0)

#define kretprobe_blacklist_size	0

arch/arm/include/asm/ptrace.h

+5 −0
Original line number Diff line number Diff line
@@ -189,6 +189,11 @@ static inline int valid_user_regs(struct pt_regs *regs) 
	return 0;

}



static inline long regs_return_value(struct pt_regs *regs)

{

	return regs->ARM_r0;

}



#define instruction_pointer(regs)	(regs)->ARM_pc



#ifdef CONFIG_SMP

arch/arm/include/asm/thread_info.h

+6 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ extern void vfp_flush_hwstate(struct thread_info *); 
/*

 * thread information flags:

 *  TIF_SYSCALL_TRACE	- syscall trace active

 *  TIF_SYSCAL_AUDIT	- syscall auditing active

 *  TIF_SIGPENDING	- signal pending

 *  TIF_NEED_RESCHED	- rescheduling necessary

 *  TIF_NOTIFY_RESUME	- callback before returning to user
@@ -139,6 +140,7 @@ extern void vfp_flush_hwstate(struct thread_info *); 
#define TIF_NEED_RESCHED	1

#define TIF_NOTIFY_RESUME	2	/* callback before returning to user */

#define TIF_SYSCALL_TRACE	8

#define TIF_SYSCALL_AUDIT	9

#define TIF_POLLING_NRFLAG	16

#define TIF_USING_IWMMXT	17

#define TIF_MEMDIE		18	/* is terminating due to OOM killer */
@@ -149,11 +151,15 @@ extern void vfp_flush_hwstate(struct thread_info *); 
#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)

#define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)

#define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)

#define _TIF_RESTORE_SIGMASK	(1 << TIF_RESTORE_SIGMASK)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)



/* Checks for any syscall work in entry-common.S */

#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)



/*

 * Change these and you break ASM code in entry-common.S

 */

arch/arm/kernel/entry-common.S

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ ENTRY(ret_from_fork) 
	get_thread_info tsk

	ldr	r1, [tsk, #TI_FLAGS]		@ check for syscall tracing

	mov	why, #1

	tst	r1, #_TIF_SYSCALL_TRACE		@ are we tracing syscalls?

	tst	r1, #_TIF_SYSCALL_WORK		@ are we tracing syscalls?

	beq	ret_slow_syscall

	mov	r1, sp

	mov	r0, #1				@ trace exit [IP = 1]
@@ -443,7 +443,7 @@ ENTRY(vector_swi) 
1:

#endif



	tst	r10, #_TIF_SYSCALL_TRACE		@ are we tracing syscalls?

	tst	r10, #_TIF_SYSCALL_WORK		@ are we tracing syscalls?

	bne	__sys_trace



	cmp	scno, #NR_syscalls		@ check upper syscall limit

arch/arm/kernel/ptrace.c

+11 −5
Original line number Diff line number Diff line
@@ -906,11 +906,6 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno) 
{

	unsigned long ip;



	if (!test_thread_flag(TIF_SYSCALL_TRACE))

		return scno;

	if (!(current->ptrace & PT_PTRACED))

		return scno;



	/*

	 * Save IP.  IP is used to denote syscall entry/exit:

	 *  IP = 0 -> entry, = 1 -> exit
@@ -918,6 +913,17 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno) 
	ip = regs->ARM_ip;

	regs->ARM_ip = why;



	if (!ip)

		audit_syscall_exit(regs);

	else

		audit_syscall_entry(AUDIT_ARCH_ARMEB, scno, regs->ARM_r0,

				    regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);



	if (!test_thread_flag(TIF_SYSCALL_TRACE))

		return scno;

	if (!(current->ptrace & PT_PTRACED))

		return scno;



	current_thread_info()->syscall = scno;



	/* the 0x80 provides a way for the tracing parent to distinguish

CRA Git | Maintained and supported by SUSTech CRA and CCSE