michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Fix Server Object SSID access

Browse source 
Server Object SSID should only have Read access.
LightweightM2M-1.1-int-256 confirmance test validate
that write operation to SSID should return error.
Overwrite SSID affect dead block for lwm2m engine and
only reset will heal.

Fix by adding bootstrap overwrite access for Security and
Server object when bootstrap is active.

Signed-off-by: Juha Heiskanen <juha.heiskanen@nordicsemi.no>
This commit is contained in:
Juha Heiskanen 2022-02-01 02:45:52 -08:00 • committed by Carles Cufí
commit a03deb8ef3
6 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2485,6 +2485,21 @@ static int lwm2m_write_handler_opaque(struct lwm2m_engine_obj_inst *obj_inst,
return opaque_ctx.len; return opaque_ctx.len;
} }
bool lwm2m_engine_bootstrap_override(struct lwm2m_ctx *client_ctx, struct lwm2m_obj_path *path)
{
if (!client_ctx->bootstrap_mode) {
/* Bootstrap is not active override is not possible then */
return false;
}
if (path->obj_id == LWM2M_OBJECT_SECURITY_ID || path->obj_id == LWM2M_OBJECT_SERVER_ID) {
/* Bootstrap server have a access to Security and Server object */
return true;
}
return false;
}
/* This function is exposed for the content format writers */ /* This function is exposed for the content format writers */
int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst, int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
struct lwm2m_engine_res *res, struct lwm2m_engine_res *res,

2
subsys/net/lib/lwm2m/lwm2m_engine.h
View file

@ -104,6 +104,8 @@ int lwm2m_write_handler(struct lwm2m_engine_obj_inst *obj_inst,
struct lwm2m_engine_obj_field *obj_field, struct lwm2m_engine_obj_field *obj_field,
struct lwm2m_message *msg); struct lwm2m_message *msg);
bool lwm2m_engine_bootstrap_override(struct lwm2m_ctx *client_ctx, struct lwm2m_obj_path *path);
int lwm2m_discover_handler(struct lwm2m_message *msg, bool is_bootstrap); int lwm2m_discover_handler(struct lwm2m_message *msg, bool is_bootstrap);
enum coap_block_size lwm2m_default_block_size(void); enum coap_block_size lwm2m_default_block_size(void);

7
subsys/net/lib/lwm2m/lwm2m_obj_server.c
View file

@ -85,12 +85,7 @@ static char transport_binding[MAX_INSTANCE_COUNT][TRANSPORT_BINDING_LEN];
static struct lwm2m_engine_obj server; static struct lwm2m_engine_obj server;
static struct lwm2m_engine_obj_field fields[] = { static struct lwm2m_engine_obj_field fields[] = {
/* OBJ_FIELD_DATA(SERVER_SHORT_SERVER_ID, R, U16),
* LwM2M TS "E.2 LwM2M Object: LwM2M Server" page 107, describes
* Short Server ID as READ-ONLY, but BOOTSTRAP server will attempt
* to write it, so it needs to be RW
*/
OBJ_FIELD_DATA(SERVER_SHORT_SERVER_ID, RW, U16),
OBJ_FIELD_DATA(SERVER_LIFETIME_ID, RW, U32), OBJ_FIELD_DATA(SERVER_LIFETIME_ID, RW, U32),
OBJ_FIELD_DATA(SERVER_DEFAULT_MIN_PERIOD_ID, RW_OPT, U32), OBJ_FIELD_DATA(SERVER_DEFAULT_MIN_PERIOD_ID, RW_OPT, U32),
OBJ_FIELD_DATA(SERVER_DEFAULT_MAX_PERIOD_ID, RW_OPT, U32), OBJ_FIELD_DATA(SERVER_DEFAULT_MAX_PERIOD_ID, RW_OPT, U32),

3
subsys/net/lib/lwm2m/lwm2m_rw_json.c
View file

@ -1028,7 +1028,8 @@ int do_write_op_json(struct lwm2m_message *msg)
* resources are ignored * resources are ignored
*/ */
if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W)) { if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W) &&
!lwm2m_engine_bootstrap_override(msg->ctx, &msg->path)) {
ret = -EPERM; ret = -EPERM;
break; break;
} }

3
subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
View file

@ -821,7 +821,8 @@ static int do_write_op_tlv_item(struct lwm2m_message *msg)
goto error; goto error;
} }
if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W)) { if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W) &&
!lwm2m_engine_bootstrap_override(msg->ctx, &msg->path)) {
ret = -EPERM; ret = -EPERM;
goto error; goto error;
} }

3
subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
View file

@ -446,7 +446,8 @@ int do_write_op_plain_text(struct lwm2m_message *msg)
return -ENOENT; return -ENOENT;
} }
if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W)) { if (!LWM2M_HAS_PERM(obj_field, LWM2M_PERM_W) &&
!lwm2m_engine_bootstrap_override(msg->ctx, &msg->path)) {
return -EPERM; return -EPERM;
} }