Skip to content

Commit 81abf25

Browse files
committed
Merge tag 'lkdtm-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
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
2 parents 1eccfa0 + e50bd23 commit 81abf25

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

drivers/misc/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,6 @@ OBJCOPYFLAGS :=
6969
OBJCOPYFLAGS_lkdtm_rodata_objcopy.o := \
7070
--set-section-flags .text=alloc,readonly \
7171
--rename-section .text=.rodata
72-
$(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o
72+
targets += lkdtm_rodata.o lkdtm_rodata_objcopy.o
73+
$(obj)/lkdtm_rodata_objcopy.o: $(obj)/lkdtm_rodata.o FORCE
7374
$(call if_changed,objcopy)

drivers/misc/lkdtm_usercopy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame)
4949

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

0 commit comments

Comments
 (0)