1 files changed, 9 insertions, 6 deletions

diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index ed5d34925ad0..6a4b41484afe 100644
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -216,7 +216,7 @@ static char *kdb_read(char *buffer, size_t bufsize)
         int count;
         int i;
         int diag, dtab_count;
-        int key;
+        int key, buf_size, ret;
 
 
         diag = kdbgetintenv("DTABCOUNT", &dtab_count);
@@ -336,9 +336,8 @@ poll_again:
                 else
                         p_tmp = tmpbuffer;
                 len = strlen(p_tmp);
-                count = kallsyms_symbol_complete(p_tmp,
-                                                 sizeof(tmpbuffer) -
-                                                 (p_tmp - tmpbuffer));
+                buf_size = sizeof(tmpbuffer) - (p_tmp - tmpbuffer);
+                count = kallsyms_symbol_complete(p_tmp, buf_size);
                 if (tab == 2 && count > 0) {
                         kdb_printf("\n%d symbols are found.", count);
                         if (count > dtab_count) {
@@ -350,9 +349,13 @@ poll_again:
                         }
                         kdb_printf("\n");
                         for (i = 0; i < count; i++) {
-                                if (WARN_ON(!kallsyms_symbol_next(p_tmp, i)))
+                                ret = kallsyms_symbol_next(p_tmp, i, buf_size);
+                                if (WARN_ON(!ret))
                                         break;
-                                kdb_printf("%s ", p_tmp);
+                                if (ret != -E2BIG)
+                                        kdb_printf("%s ", p_tmp);
+                                else
+                                        kdb_printf("%s... ", p_tmp);
                                 *(p_tmp + len) = '\0';
                         }
                         if (i >= dtab_count)