From 49fb847ff3dc8b7de91eb3a54524e60b145f9bf4 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Sat, 4 Feb 2017 20:08:02 +0100 Subject: irmd: Handle death of IPCP gracefully If an IPCP SEGVs abruptly, the sanitizer in the IRMd would also cause a SEGV because of looping over a registry linked list inside another safe loop over the same list. A function is added to the registry to avoid this. --- src/irmd/registry.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'src/irmd/registry.c') diff --git a/src/irmd/registry.c b/src/irmd/registry.c index 7e21375e..fec69cfa 100644 --- a/src/irmd/registry.c +++ b/src/irmd/registry.c @@ -296,6 +296,29 @@ int reg_entry_add_api(struct reg_entry * e, pid_t api) return 0; } +static void reg_entry_check_state(struct reg_entry * e) +{ + if (list_is_empty(&e->reg_apis)) { + if (!list_is_empty(&e->reg_apns)) + e->state = REG_NAME_AUTO_ACCEPT; + else + e->state = REG_NAME_IDLE; + } else { + e->state = REG_NAME_FLOW_ACCEPT; + } + + pthread_cond_broadcast(&e->state_cond); +} + +void reg_entry_del_pid_el(struct reg_entry * e, + struct pid_el * p) +{ + list_del(&p->next); + free(p); + + reg_entry_check_state(e); +} + void reg_entry_del_api(struct reg_entry * e, pid_t api) { struct list_head * p; @@ -312,16 +335,7 @@ void reg_entry_del_api(struct reg_entry * e, pid_t api) } } - if (list_is_empty(&e->reg_apis)) { - if (!list_is_empty(&e->reg_apns)) - e->state = REG_NAME_AUTO_ACCEPT; - else - e->state = REG_NAME_IDLE; - } else { - e->state = REG_NAME_FLOW_ACCEPT; - } - - pthread_cond_broadcast(&e->state_cond); + reg_entry_check_state(e); } pid_t reg_entry_get_api(struct reg_entry * e) -- cgit v1.2.3