Commit d74e026a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'lkdtm-next' of... 

Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing

Kees writes:

Become maintainer, add hardening tests for use-after-free and atomic wrapping.
parents 449a97d0 7c0ae5be

Documentation/watchdog/watchdog-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -400,3 +400,7 @@ wm8350_wdt: 
nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

-------------------------------------------------

sun4v_wdt:

timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000)

nowayout: Watchdog cannot be stopped once started

-------------------------------------------------

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -6581,6 +6581,11 @@ F: samples/livepatch/ 
L:	live-patching@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git



LINUX KERNEL DUMP TEST MODULE (LKDTM)

M:	Kees Cook <keescook@chromium.org>

S:	Maintained

F:	drivers/misc/lkdtm.c



LLC (802.2)

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

S:	Maintained

arch/sparc/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -24,7 +24,13 @@ LDFLAGS := -m elf32_sparc 
export BITS    := 32

UTS_MACHINE    := sparc



# We are adding -Wa,-Av8 to KBUILD_CFLAGS to deal with a specs bug in some

# versions of gcc.  Some gcc versions won't pass -Av8 to binutils when you

# give -mcpu=v8.  This silently worked with older bintutils versions but

# does not any more.

KBUILD_CFLAGS  += -m32 -mcpu=v8 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7

KBUILD_CFLAGS  += -Wa,-Av8



KBUILD_AFLAGS  += -m32 -Wa,-Av8



else

arch/sparc/include/uapi/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -422,8 +422,9 @@ 
#define __NR_listen		354

#define __NR_setsockopt		355

#define __NR_mlock2		356

#define __NR_copy_file_range	357



#define NR_syscalls		357

#define NR_syscalls		358



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001

arch/sparc/kernel/entry.S

+17 −0
Original line number Diff line number Diff line
@@ -948,7 +948,24 @@ linux_syscall_trace: 
	cmp	%o0, 0

	bne	3f

	 mov	-ENOSYS, %o0



	/* Syscall tracing can modify the registers.  */

	ld	[%sp + STACKFRAME_SZ + PT_G1], %g1

	sethi	%hi(sys_call_table), %l7

	ld	[%sp + STACKFRAME_SZ + PT_I0], %i0

	or	%l7, %lo(sys_call_table), %l7

	ld	[%sp + STACKFRAME_SZ + PT_I1], %i1

	ld	[%sp + STACKFRAME_SZ + PT_I2], %i2

	ld	[%sp + STACKFRAME_SZ + PT_I3], %i3

	ld	[%sp + STACKFRAME_SZ + PT_I4], %i4

	ld	[%sp + STACKFRAME_SZ + PT_I5], %i5

	cmp	%g1, NR_syscalls

	bgeu	3f

	 mov	-ENOSYS, %o0



	sll	%g1, 2, %l4

	mov	%i0, %o0

	ld	[%l7 + %l4], %l7

	mov	%i1, %o1

	mov	%i2, %o2

	mov	%i3, %o3