xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/xmon: Move breakpoints to text section

Browse Source 
The instructions for xmon's breakpoint are stored bpt_table[] which is in
the data section. This is problematic as the data section may be marked
as no execute. Move bpt_table[] to the text section.

Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200506034050.24806-4-jniethe5@gmail.com
This commit is contained in:
Jordan Niethe
2020-05-06 13:40:23 +10:00
committed by Michael Ellerman
parent 51c9ba11f1
commit 4eff2b4f32
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/xmon/xmon.c
View File

@@ -62,6 +62,7 @@
#include "nonstdio.h"
#include "dis-asm.h"
#include "xmon_bpts.h"
#ifdef CONFIG_SMP
static cpumask_t cpus_in_xmon = CPU_MASK_NONE;
@@ -109,7 +110,6 @@ struct bpt {
#define BP_TRAP 2
#define BP_DABR 4
#define NBPTS 256
static struct bpt bpts[NBPTS];
static struct bpt dabr;
static struct bpt *iabr;
@@ -117,10 +117,6 @@ static unsigned bpinstr = 0x7fe00008; /* trap */
#define BP_NUM(bp) ((bp) - bpts + 1)
#define BPT_SIZE (sizeof(unsigned int) * 2)
#define BPT_WORDS (BPT_SIZE / sizeof(unsigned int))
static unsigned int bpt_table[NBPTS * BPT_WORDS];
/* Prototypes */
static int cmds(struct pt_regs *);
static int mread(unsigned long, void *, int);