From 49865053bc47c00ea50b6cee2eeecf61c2dd2fdb Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Tue, 17 Jul 2018 18:35:05 +0200 Subject: [PATCH] ctrl/vty: fsm: use correct element when iterating over fsm->proc.children Fixes crashes when using vty `show fsm-instances all` when fsm children are present. Change-Id: I4ae0bee7f7f57ec6675cfb52ca6cf0d523d15362 --- src/ctrl/fsm_ctrl_commands.c | 2 +- src/vty/fsm_vty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ctrl/fsm_ctrl_commands.c b/src/ctrl/fsm_ctrl_commands.c index 3c7e1bd07..c93d3a52d 100644 --- a/src/ctrl/fsm_ctrl_commands.c +++ b/src/ctrl/fsm_ctrl_commands.c @@ -156,7 +156,7 @@ static int get_fsm_inst_dump(struct ctrl_cmd *cmd, void *data) if (fi->proc.parent) cmd->reply = talloc_asprintf_append(cmd->reply, ",parent='%s'", fi->proc.parent->name); - llist_for_each_entry(child, &fi->proc.children, list) { + llist_for_each_entry(child, &fi->proc.children, proc.child) { cmd->reply = talloc_asprintf_append(cmd->reply, ",child='%s'", child->name); } diff --git a/src/vty/fsm_vty.c b/src/vty/fsm_vty.c index 8628d1598..9bde241ce 100644 --- a/src/vty/fsm_vty.c +++ b/src/vty/fsm_vty.c @@ -102,7 +102,7 @@ void vty_out_fsm_inst(struct vty *vty, struct osmo_fsm_inst *fsmi) fsmi->proc.parent_term_event), VTY_NEWLINE); } - llist_for_each_entry(child, &fsmi->proc.children, list) { + llist_for_each_entry(child, &fsmi->proc.children, proc.child) { vty_out(vty, " Child: '%s'%s", child->name, VTY_NEWLINE); } }