kdb: Use format-strings rather than '\0' injection in kdb_read()

Currently when kdb_read() needs to reposition the cursor it uses copy and
paste code that works by injecting an '\0' at the cursor position before
delivering a carriage-return and reprinting the line (which stops at the
'\0').

Tidy up the code by hoisting the copy and paste code into an appropriately
named function. Additionally let's replace the '\0' injection with a
proper field width parameter so that the string will be abridged during
formatting instead.

Cc: stable@vger.kernel.org # Not a bug fix but it is needed for later bug fixes
Tested-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20240424-kgdb_read_refactor-v3-2-f236dbe9828d@linaro.org
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>

diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index 06dfbccb103368a240a1725591778da07bc4c88b..50789c99b3ba897602d4e5aba07fd8dc3f7b9da6 100644 (file)
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -184,6 +184,33 @@ char kdb_getchar(void)
        unreachable();
 }
 
+/**
+ * kdb_position_cursor() - Place cursor in the correct horizontal position
+ * @prompt: Nil-terminated string containing the prompt string
+ * @buffer: Nil-terminated string containing the entire command line
+ * @cp: Cursor position, pointer the character in buffer where the cursor
+ *      should be positioned.
+ *
+ * The cursor is positioned by sending a carriage-return and then printing
+ * the content of the line until we reach the correct cursor position.
+ *
+ * There is some additional fine detail here.
+ *
+ * Firstly, even though kdb_printf() will correctly format zero-width fields
+ * we want the second call to kdb_printf() to be conditional. That keeps things
+ * a little cleaner when LOGGING=1.
+ *
+ * Secondly, we can't combine everything into one call to kdb_printf() since
+ * that renders into a fixed length buffer and the combined print could result
+ * in unwanted truncation.
+ */
+static void kdb_position_cursor(char *prompt, char *buffer, char *cp)
+{
+       kdb_printf("\r%s", kdb_prompt_str);
+       if (cp > buffer)
+               kdb_printf("%.*s", (int)(cp - buffer), buffer);
+}
+
 /*
  * kdb_read
  *
@@ -212,7 +239,6 @@ static char *kdb_read(char *buffer, size_t bufsize)
                                                 * and null byte */
        char *lastchar;
        char *p_tmp;
-       char tmp;
        static char tmpbuffer[CMD_BUFLEN];
        int len = strlen(buffer);
        int len_tmp;
@@ -249,12 +275,8 @@ poll_again:
                        }
                        *(--lastchar) = '\0';
                        --cp;
-                       kdb_printf("\b%s \r", cp);
-                       tmp = *cp;
-                       *cp = '\0';
-                       kdb_printf(kdb_prompt_str);
-                       kdb_printf("%s", buffer);
-                       *cp = tmp;
+                       kdb_printf("\b%s ", cp);
+                       kdb_position_cursor(kdb_prompt_str, buffer, cp);
                }
                break;
        case 10: /* linefeed */
@@ -272,19 +294,14 @@ poll_again:
                        memcpy(tmpbuffer, cp+1, lastchar - cp - 1);
                        memcpy(cp, tmpbuffer, lastchar - cp - 1);
                        *(--lastchar) = '\0';
-                       kdb_printf("%s \r", cp);
-                       tmp = *cp;
-                       *cp = '\0';
-                       kdb_printf(kdb_prompt_str);
-                       kdb_printf("%s", buffer);
-                       *cp = tmp;
+                       kdb_printf("%s ", cp);
+                       kdb_position_cursor(kdb_prompt_str, buffer, cp);
                }
                break;
        case 1: /* Home */
                if (cp > buffer) {
-                       kdb_printf("\r");
-                       kdb_printf(kdb_prompt_str);
                        cp = buffer;
+                       kdb_position_cursor(kdb_prompt_str, buffer, cp);
                }
                break;
        case 5: /* End */
@@ -390,13 +407,9 @@ poll_again:
                                memcpy(cp+1, tmpbuffer, lastchar - cp);
                                *++lastchar = '\0';
                                *cp = key;
-                               kdb_printf("%s\r", cp);
+                               kdb_printf("%s", cp);
                                ++cp;
-                               tmp = *cp;
-                               *cp = '\0';
-                               kdb_printf(kdb_prompt_str);
-                               kdb_printf("%s", buffer);
-                               *cp = tmp;
+                               kdb_position_cursor(kdb_prompt_str, buffer, cp);
                        } else {
                                *++lastchar = '\0';
                                *cp++ = key;