michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: Fix attribute sanity check

Browse source 
Validate the respective attribute parameters only if both are provided
at given level. This prevents from comparing for instance unset pmax
value (equal to 0) with some new pmin value sent by the server.

Additionally, fix the sanity check for the `pmax` value set on observer,
after fetching the attribute value at all levels (including the default
value at from the server object). Instead of using wrong max(pmin, pmax)
formula, set the pmax value only if it's a valid one (>= pmin),
otherwise ignore the value and set it to 0. This makes the notification
engine ignore the pmax value set for observation.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2022-01-20 12:31:04 +01:00 • committed by Anas Nashif
commit d002f8a524
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

@ -2817,13 +2817,15 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
nattrs.flags |= BIT(type);
}
if ((nattrs.flags & (BIT(LWM2M_ATTR_PMIN) | BIT(LWM2M_ATTR_PMAX))) &&
if (((nattrs.flags & (BIT(LWM2M_ATTR_PMIN) | BIT(LWM2M_ATTR_PMAX))) ==
(BIT(LWM2M_ATTR_PMIN) | BIT(LWM2M_ATTR_PMAX))) &&
nattrs.pmin > nattrs.pmax) {
LOG_DBG("pmin (%d) > pmax (%d)", nattrs.pmin, nattrs.pmax);
return -EEXIST;
}
if (nattrs.flags & (BIT(LWM2M_ATTR_LT) | BIT(LWM2M_ATTR_GT))) {
if ((nattrs.flags & (BIT(LWM2M_ATTR_LT) | BIT(LWM2M_ATTR_GT))) ==
(BIT(LWM2M_ATTR_LT) | BIT(LWM2M_ATTR_GT))) {
if (nattrs.lt > nattrs.gt) {
LOG_DBG("lt > gt");
return -EEXIST;
@ -2994,7 +2996,9 @@ static int lwm2m_write_attr_handler(struct lwm2m_engine_obj *obj,
obs->min_period_sec, obs->max_period_sec,
nattrs.pmin, MAX(nattrs.pmin, nattrs.pmax));
obs->min_period_sec = (uint32_t)nattrs.pmin;
obs->max_period_sec = (uint32_t)MAX(nattrs.pmin, nattrs.pmax);
/* Ignore pmax value if pmax < pmin. */
obs->max_period_sec = (nattrs.pmax >= nattrs.pmin) ?
(uint32_t)nattrs.pmax : 0UL;
(void)memset(&nattrs, 0, sizeof(nattrs));
}