Commit 81abf252 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 1eccfa09 e50bd235
...@@ -69,5 +69,6 @@ OBJCOPYFLAGS := ...@@ -69,5 +69,6 @@ OBJCOPYFLAGS :=
OBJCOPYFLAGS_lkdtm_rodata_objcopy.o := \ OBJCOPYFLAGS_lkdtm_rodata_objcopy.o := \
--set-section-flags .text=alloc,readonly \ --set-section-flags .text=alloc,readonly \
--rename-section .text=.rodata --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) $(call if_changed,objcopy)
...@@ -49,7 +49,7 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame) ...@@ -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. */ /* This is a pointer to outside our current stack frame. */
if (bad_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 { } else {
/* Put start address just inside stack. */ /* Put start address just inside stack. */
bad_stack = task_stack_page(current) + THREAD_SIZE; bad_stack = task_stack_page(current) + THREAD_SIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment