matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: nb: fix bug with oper-state query on list data

Browse source 
The capacity of the xpath string was not guaranteed to be sufficient to hold all
the key predicates and so would truncate. Calculate the required space and
guarantee that it is available.

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2025-02-26 13:34:59 +00:00
parent 37893e4421
commit a64ecbadcc
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/northbound_oper.c
View file

@ -1492,8 +1492,9 @@ static enum nb_error __walk(struct nb_op_yield_state *ys, bool is_resume)
*/
len = darr_strlen(ys->xpath);
if (ni->keys.num) {
yang_get_key_preds(ys->xpath + len, sib,
&ni->keys,
darr_ensure_avail(ys->xpath,
yang_get_key_pred_strlen(sib, &ni->keys) + 1);
yang_get_key_preds(ys->xpath + len, sib, &ni->keys,
darr_cap(ys->xpath) - len);
} else {
/* add a position predicate (1s based?) */

17
lib/yang.c
View file

@ -1357,9 +1357,22 @@ uint32_t yang_get_list_elements_count(const struct lyd_node *node)
} while (node);
return count;
}
int yang_get_key_pred_strlen(const struct lysc_node *snode, const struct yang_list_keys *keys)
{
const struct lysc_node_leaf *skey;
size_t len = 0;
size_t i = 0;
int yang_get_key_preds(char *s, const struct lysc_node *snode,
struct yang_list_keys *keys, ssize_t space)
LY_FOR_KEYS (snode, skey) {
/* [%s='%s'] */
len += 5 + strlen(skey->name) + strlen(keys->key[i]);
i++;
}
return len;
}
int yang_get_key_preds(char *s, const struct lysc_node *snode, const struct yang_list_keys *keys,
ssize_t space)
{
const struct lysc_node_leaf *skey;
ssize_t len2, len = 0;

6
lib/yang.h
View file

@ -879,7 +879,11 @@ bool yang_is_last_level_dnode(const struct lyd_node *dnode);
/* Create a YANG predicate string based on the keys */
extern int yang_get_key_preds(char *s, const struct lysc_node *snode,
struct yang_list_keys *keys, ssize_t space);
const struct yang_list_keys *keys, ssize_t space);
/* Get the length of the predicate string based on the keys */
extern int yang_get_key_pred_strlen(const struct lysc_node *snode,
const struct yang_list_keys *keys);
/* Get YANG keys from an existing dnode */
extern int yang_get_node_keys(struct lyd_node *node, struct yang_list_keys *keys);