michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: fix obj/obj_inst/observer sys_slist_t corrupted when remove

Browse source 
We were using sys_slist_remove() to remove object, object instance and
observer w/o passing the previous sys_snode_t to it (NULL).
This will instruct the function to treat the node as the list head and
result in unexpected behavior after the removal.

Correct it by using sys_slist_find_and_remove() or passing the previous
node to the function.

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2017-09-05 11:03:47 +08:00 • committed by Jukka Rissanen
commit b6a0cdfd64
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/net/lib/lwm2m/lwm2m_engine.c
View file

@ -252,6 +252,7 @@ static int engine_add_observer(struct net_context *net_ctx,
static int engine_remove_observer(const u8_t *token, u8_t tkl) static int engine_remove_observer(const u8_t *token, u8_t tkl)
{ {
struct observe_node *obs, *found_obj = NULL; struct observe_node *obs, *found_obj = NULL;
sys_snode_t *prev_node = NULL;
if (!token || tkl == 0) { if (!token || tkl == 0) {
SYS_LOG_ERR("token(%p) and token length(%u) must be valid.", SYS_LOG_ERR("token(%p) and token length(%u) must be valid.",
@ -265,13 +266,16 @@ static int engine_remove_observer(const u8_t *token, u8_t tkl)
found_obj = obs; found_obj = obs;
break; break;
} }
prev_node = &obs->node;
} }
if (!found_obj) { if (!found_obj) {
return -ENOENT; return -ENOENT;
} }
sys_slist_remove(&engine_observer_list, NULL, &found_obj->node); sys_slist_remove(&engine_observer_list, prev_node, &found_obj->node);
memset(found_obj, 0, sizeof(*found_obj));
SYS_LOG_DBG("observer '%s' removed", sprint_token(token, tkl)); SYS_LOG_DBG("observer '%s' removed", sprint_token(token, tkl));
@ -288,7 +292,7 @@ void lwm2m_register_obj(struct lwm2m_engine_obj *obj)
void lwm2m_unregister_obj(struct lwm2m_engine_obj *obj) void lwm2m_unregister_obj(struct lwm2m_engine_obj *obj)
{ {
/* TODO: remove all observer instances */ /* TODO: remove all observer instances */
sys_slist_remove(&engine_obj_list, NULL, &obj->node); sys_slist_find_and_remove(&engine_obj_list, &obj->node);
} }
static struct lwm2m_engine_obj *get_engine_obj(int obj_id) static struct lwm2m_engine_obj *get_engine_obj(int obj_id)
@ -329,7 +333,7 @@ static void engine_register_obj_inst(struct lwm2m_engine_obj_inst *obj_inst)
static void engine_unregister_obj_inst(struct lwm2m_engine_obj_inst *obj_inst) static void engine_unregister_obj_inst(struct lwm2m_engine_obj_inst *obj_inst)
{ {
sys_slist_remove(&engine_obj_inst_list, NULL, &obj_inst->node); sys_slist_find_and_remove(&engine_obj_inst_list, &obj_inst->node);
} }
static struct lwm2m_engine_obj_inst *get_engine_obj_inst(int obj_id, static struct lwm2m_engine_obj_inst *get_engine_obj_inst(int obj_id,