michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: return 4.04 (not found) when obj/obj_inst/res not exist

Browse source 
We did not check the requested object/object instance/resource exists or
not before we adding an observer. Correct it by checking the existence
first.

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2017-09-05 14:29:41 +08:00 • committed by Jukka Rissanen
commit 70ee7e31af
1 changed files with 38 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,10 @@ static K_THREAD_STACK_DEFINE(engine_thread_stack,
CONFIG_LWM2M_ENGINE_STACK_SIZE); CONFIG_LWM2M_ENGINE_STACK_SIZE);
static struct k_thread engine_thread_data; static struct k_thread engine_thread_data;
static struct lwm2m_engine_obj *get_engine_obj(int obj_id);
static struct lwm2m_engine_obj_inst *get_engine_obj_inst(int obj_id,
int obj_inst_id);
/* for debugging: to print IP addresses */ /* for debugging: to print IP addresses */
char *lwm2m_sprint_ip_addr(const struct sockaddr *addr) char *lwm2m_sprint_ip_addr(const struct sockaddr *addr)
{ {
@ -187,6 +191,7 @@ static int engine_add_observer(struct net_context *net_ctx,
struct lwm2m_obj_path *path, struct lwm2m_obj_path *path,
u16_t format) u16_t format)
{ {
struct lwm2m_engine_obj_inst *obj_inst = NULL;
struct observe_node *obs; struct observe_node *obs;
int i; int i;
@ -195,6 +200,39 @@ static int engine_add_observer(struct net_context *net_ctx,
return -EINVAL; return -EINVAL;
} }
/* check if object exists */
if (!get_engine_obj(path->obj_id)) {
SYS_LOG_ERR("unable to find obj: %u", path->obj_id);
return -ENOENT;
}
/* check if object instance exists */
if (path->level >= 2) {
obj_inst = get_engine_obj_inst(path->obj_id,
path->obj_inst_id);
if (!obj_inst) {
SYS_LOG_ERR("unable to find obj_inst: %u/%u",
path->obj_id, path->obj_inst_id);
return -ENOENT;
}
}
/* check if resource exists */
if (path->level >= 3) {
for (i = 0; i < obj_inst->resource_count; i++) {
if (obj_inst->resources[i].res_id == path->res_id) {
break;
}
}
if (i == obj_inst->resource_count) {
SYS_LOG_ERR("unable to find res_id: %u/%u/%u",
path->obj_id, path->obj_inst_id,
path->res_id);
return -ENOENT;
}
}
/* make sure this observer doesn't exist already */ /* make sure this observer doesn't exist already */
SYS_SLIST_FOR_EACH_CONTAINER(&engine_observer_list, obs, node) { SYS_SLIST_FOR_EACH_CONTAINER(&engine_observer_list, obs, node) {
if (memcmp(&obs->addr, addr, sizeof(addr)) == 0 && if (memcmp(&obs->addr, addr, sizeof(addr)) == 0 &&