Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83650fd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull more arm64 updates from Catalin Marinas:

 - fix W+X page (mark RO) allocated by the arm64 kprobes code

 - Makefile fix for .i files in out of tree modules

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: kprobe: make page to RO mode when allocate it
  arm64: kdump: fix small typo
  arm64: makefile fix build of .i file in external module case
parents 3308a383 96686689

arch/arm64/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ vdso_install: 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



ifeq ($(KBUILD_EXTMOD),)

# We need to generate vdso-offsets.h before compiling certain files in kernel/.

# In order to do that, we should use the archprepare target, but we can't since

# asm-offsets.h is included in some files used to generate vdso-offsets.h, and
@@ -143,6 +144,7 @@ archclean: 
prepare: vdso_prepare

vdso_prepare: prepare0

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h

endif



define archhelp

  echo  '* Image.gz      - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'

arch/arm64/kernel/crash_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, 
/**

 * elfcorehdr_read - read from ELF core header

 * @buf: buffer where the data is placed

 * @csize: number of bytes to read

 * @count: number of bytes to read

 * @ppos: address in the memory

 *

 * This function reads @count bytes from elf core header which exists

arch/arm64/kernel/probes/kprobes.c

+20 −7
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
#include <linux/slab.h>

#include <linux/stop_machine.h>

#include <linux/sched/debug.h>

#include <linux/set_memory.h>

#include <linux/stringify.h>

#include <linux/vmalloc.h>

#include <asm/traps.h>

#include <asm/ptrace.h>

#include <asm/cacheflush.h>
@@ -42,10 +44,21 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); 
static void __kprobes

post_kprobe_handler(struct kprobe_ctlblk *, struct pt_regs *);



static int __kprobes patch_text(kprobe_opcode_t *addr, u32 opcode)

{

	void *addrs[1];

	u32 insns[1];



	addrs[0] = addr;

	insns[0] = opcode;



	return aarch64_insn_patch_text(addrs, insns, 1);

}



static void __kprobes arch_prepare_ss_slot(struct kprobe *p)

{

	/* prepare insn slot */

	p->ainsn.api.insn[0] = cpu_to_le32(p->opcode);

	patch_text(p->ainsn.api.insn, p->opcode);



	flush_icache_range((uintptr_t) (p->ainsn.api.insn),

			   (uintptr_t) (p->ainsn.api.insn) +
@@ -118,15 +131,15 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	return 0;

}



static int __kprobes patch_text(kprobe_opcode_t *addr, u32 opcode)

void *alloc_insn_page(void)

{

	void *addrs[1];

	u32 insns[1];

	void *page;



	addrs[0] = (void *)addr;

	insns[0] = (u32)opcode;

	page = vmalloc_exec(PAGE_SIZE);

	if (page)

		set_memory_ro((unsigned long)page, 1);



	return aarch64_insn_patch_text(addrs, insns, 1);

	return page;

}



/* arm kprobe: install breakpoint in text */