| Message ID | 20190828034613.14750-2-cmr@informatik.wtf (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Restrict xmon when kernel is locked down | expand |
Hi Chris, > Read-only mode should not prevent listing and clearing any active > breakpoints. I tested this and it works for me: Tested-by: Daniel Axtens <dja@axtens.net> > + if (xmon_is_ro || !scanhex(&a)) { It took me a while to figure out what this line does: as I understand it, the 'b' command can also be used to install a breakpoint (as well as bi/bd). If we are in ro mode or if the input after 'b' doesn't scan as a hex string, print the list of breakpoints instead. Anyway, I'm now happy with it, so: Reviewed-by: Daniel Axtens <dja@axtens.net> Regards, Daniel > /* print all breakpoints */ > printf(" type address\n"); > if (dabr.enabled) { > -- > 2.23.0
> On August 29, 2019 at 1:40 AM Daniel Axtens <dja@axtens.net> wrote: > > > Hi Chris, > > > Read-only mode should not prevent listing and clearing any active > > breakpoints. > > I tested this and it works for me: > > Tested-by: Daniel Axtens <dja@axtens.net> > > > + if (xmon_is_ro || !scanhex(&a)) { > > It took me a while to figure out what this line does: as I understand > it, the 'b' command can also be used to install a breakpoint (as well as > bi/bd). If we are in ro mode or if the input after 'b' doesn't scan as a > hex string, print the list of breakpoints instead. Anyway, I'm now > happy with it, so: > I can add a comment to that effect in the next version. That entire section of code could probably be cleaned up a bit - but that's for another patch. Thanks for testing! > > Reviewed-by: Daniel Axtens <dja@axtens.net> > > Regards, > Daniel > > > /* print all breakpoints */ > > printf(" type address\n"); > > if (dabr.enabled) { > > -- > > 2.23.0
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index d0620d762a5a..a98a354d46ac 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -1045,10 +1045,6 @@ cmds(struct pt_regs *excp) set_lpp_cmd(); break; case 'b': - if (xmon_is_ro) { - printf(xmon_ro_msg); - break; - } bpt_cmds(); break; case 'C': @@ -1317,11 +1313,16 @@ bpt_cmds(void) struct bpt *bp; cmd = inchar(); + switch (cmd) { #ifndef CONFIG_PPC_8xx static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n"; int mode; case 'd': /* bd - hardware data breakpoint */ + if (xmon_is_ro) { + printf(xmon_ro_msg); + break; + } if (!ppc_breakpoint_available()) { printf("Hardware data breakpoint not supported on this cpu\n"); break; @@ -1349,6 +1350,10 @@ bpt_cmds(void) break; case 'i': /* bi - hardware instr breakpoint */ + if (xmon_is_ro) { + printf(xmon_ro_msg); + break; + } if (!cpu_has_feature(CPU_FTR_ARCH_207S)) { printf("Hardware instruction breakpoint " "not supported on this cpu\n"); @@ -1407,7 +1412,7 @@ bpt_cmds(void) break; } termch = cmd; - if (!scanhex(&a)) { + if (xmon_is_ro || !scanhex(&a)) { /* print all breakpoints */ printf(" type address\n"); if (dabr.enabled) {
Read-only mode should not prevent listing and clearing any active breakpoints. Signed-off-by: Christopher M. Riedl <cmr@informatik.wtf> --- arch/powerpc/xmon/xmon.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)