Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib: guard against padding garbage in ZAPI read

Browse source 
When reading in a nexthop from ZAPI, only set the fields that actually
have meaning.  While it shouldn't happen to begin with, we can otherwise
carry padding garbage into the unused leftover union bytes.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2025-01-22 11:19:04 +01:00
parent b666ee510e
commit 4a0e1419a6
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/zclient.c
View file

@ -2300,7 +2300,27 @@ struct nexthop *nexthop_from_zapi_nexthop(const struct zapi_nexthop *znh)
n->type = znh->type;
n->vrf_id = znh->vrf_id;
n->ifindex = znh->ifindex;
n->gate = znh->gate;
/* only copy values that have meaning - make sure "spare bytes" are
* left zeroed for hashing (look at _nexthop_hash_bytes)
*/
switch (znh->type) {
case NEXTHOP_TYPE_BLACKHOLE:
n->bh_type = znh->bh_type;
break;
case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV4_IFINDEX:
n->gate.ipv4 = znh->gate.ipv4;
break;
case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV6_IFINDEX:
n->gate.ipv6 = znh->gate.ipv6;
break;
case NEXTHOP_TYPE_IFINDEX:
/* nothing, ifindex is always copied */
break;
}
n->srte_color = znh->srte_color;
n->weight = znh->weight;