Skip to content

Commit

Permalink
Merge tag 'for_linus-4.15-rc2' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…kernel/git/jwessel/kgdb

Pull kgdb fixes from Jason Wessel:

 - Fix long standing problem with kdb kallsyms_symbol_next() return
   value

 - Add new co-maintainer Daniel Thompson

* tag 'for_linus-4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  kgdb/kdb/debug_core: Add co-maintainer Daniel Thompson
  kdb: Fix handling of kallsyms_symbol_next() return value
  • Loading branch information
torvalds committed Dec 7, 2017
2 parents ba3edf1 + 4e23f78 commit 968edbd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -7767,6 +7767,7 @@ F: security/keys/

KGDB / KDB /debug_core
M: Jason Wessel <[email protected]>
M: Daniel Thompson <[email protected]>
W: http://kgdb.wiki.kernel.org/
L: [email protected]
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
Expand Down
2 changes: 1 addition & 1 deletion kernel/debug/kdb/kdb_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ static char *kdb_read(char *buffer, size_t bufsize)
}
kdb_printf("\n");
for (i = 0; i < count; i++) {
if (kallsyms_symbol_next(p_tmp, i) < 0)
if (WARN_ON(!kallsyms_symbol_next(p_tmp, i)))
break;
kdb_printf("%s ", p_tmp);
*(p_tmp + len) = '\0';
Expand Down

0 comments on commit 968edbd

Please sign in to comment.