Skip to content

Commit 968edbd

Browse files
committed
Merge tag 'for_linus-4.15-rc2' of git://git.kernel.org/pub/scm/linux/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
2 parents ba3edf1 + 4e23f78 commit 968edbd

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

MAINTAINERS

+1
Original file line numberDiff line numberDiff line change
@@ -7767,6 +7767,7 @@ F: security/keys/
77677767

77687768
KGDB / KDB /debug_core
77697769
M: Jason Wessel <[email protected]>
7770+
M: Daniel Thompson <[email protected]>
77707771
W: http://kgdb.wiki.kernel.org/
77717772
77727773
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git

kernel/debug/kdb/kdb_io.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ static char *kdb_read(char *buffer, size_t bufsize)
350350
}
351351
kdb_printf("\n");
352352
for (i = 0; i < count; i++) {
353-
if (kallsyms_symbol_next(p_tmp, i) < 0)
353+
if (WARN_ON(!kallsyms_symbol_next(p_tmp, i)))
354354
break;
355355
kdb_printf("%s ", p_tmp);
356356
*(p_tmp + len) = '\0';

0 commit comments

Comments
 (0)