Merge tag 'lkdtm-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (81abf252) · Commits · 戴 / test

Pull lkdtm update from Kees Cook: "Fix rebuild problem with LKDTM's rodata test" [ This, and the usercopy branch, both came in before the merge window closed, but ended up in my 'need to look more' queue and thus got merged only after rc1 was out ] * tag 'lkdtm-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: lkdtm: Fix targets for objcopy usage lkdtm: fix false positive warning from -Wmaybe-uninitialized

drivers/misc/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -69,5 +69,6 @@ OBJCOPYFLAGS :=
		OBJCOPYFLAGS_lkdtm_rodata_objcopy.o := \
		--set-section-flags .text=alloc,readonly \
		--rename-section .text=.rodata
		$(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o
		targets += lkdtm_rodata.o lkdtm_rodata_objcopy.o
		$(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o FORCE
		$(call if_changed,objcopy)

drivers/misc/lkdtm_usercopy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame)

		/* This is a pointer to outside our current stack frame. */
		if (bad_frame) {
		bad_stack = do_usercopy_stack_callee((uintptr_t)bad_stack);
		bad_stack = do_usercopy_stack_callee((uintptr_t)&bad_stack);
		} else {
		/* Put start address just inside stack. */
		bad_stack = task_stack_page(current) + THREAD_SIZE;

Admin message