| Message ID | 20200217041343.2454-1-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 066bc3576e653b615ee3f5230a89d69c8ebeeb71 |
| Headers | show |
| Series | powerpc/xmon: Fix whitespace handling in getstring() | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (a5bc6e124219546a81ce334dc9b16483d55e9abf) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | warning | total: 1 errors, 0 warnings, 0 checks, 11 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch fixes a commit that hasn't been released yet |
On Mon, 2020-02-17 at 04:13:43 UTC, Oliver O'Halloran wrote: > The ls (lookup symbol) and zr (reboot) commands use xmon's getstring() > helper to read a string argument from the xmon prompt. This function skips > over leading whitespace, but doesn't check if the first "non-whitespace" > character is a newline which causes some odd behaviour (<enter> indicates > a the enter key was pressed): > > 0:mon> ls printk<enter> > printk: c0000000001680c4 > > 0:mon> ls<enter> > printk<enter> > Symbol ' > printk' not found. > 0:mon> > > With commit 2d9b332d99b ("powerpc/xmon: Allow passing an argument > to ppc_md.restart()") we have a similar problem with the zr command. > Previously zr took no arguments so "zr<enter> would trigger a reboot. > With that patch applied a second newline needs to be sent in order for > the reboot to occur. Fix this by checking if the leading whitespace > ended on a newline: > > 0:mon> ls<enter> > Symbol '' not found. > > Fixes: 2d9b332d99b ("powerpc/xmon: Allow passing an argument to ppc_md.restart()") > Reported-by: Michael Ellerman <mpe@ellerman.id.au> > Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/066bc3576e653b615ee3f5230a89d69c8ebeeb71 cheers
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index e8c84d26..0ec9640 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -3435,6 +3435,11 @@ getstring(char *s, int size) int c; c = skipbl(); + if (c == '\n') { + *s = 0; + return; + } + do { if( size > 1 ){ *s++ = c;
The ls (lookup symbol) and zr (reboot) commands use xmon's getstring() helper to read a string argument from the xmon prompt. This function skips over leading whitespace, but doesn't check if the first "non-whitespace" character is a newline which causes some odd behaviour (<enter> indicates a the enter key was pressed): 0:mon> ls printk<enter> printk: c0000000001680c4 0:mon> ls<enter> printk<enter> Symbol ' printk' not found. 0:mon> With commit 2d9b332d99b ("powerpc/xmon: Allow passing an argument to ppc_md.restart()") we have a similar problem with the zr command. Previously zr took no arguments so "zr<enter> would trigger a reboot. With that patch applied a second newline needs to be sent in order for the reboot to occur. Fix this by checking if the leading whitespace ended on a newline: 0:mon> ls<enter> Symbol '' not found. Fixes: 2d9b332d99b ("powerpc/xmon: Allow passing an argument to ppc_md.restart()") Reported-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/xmon/xmon.c | 5 +++++ 1 file changed, 5 insertions(+)