Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 21:47:15 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "ospfd: fix some dicey pointer arith in snmp module"

Browse source 
This reverts commit 438ef98701.

The previous code was correct even if the coverity scanner was
complaining.

Fixes: https://github.com/FRRouting/frr/issues/15680
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2024-04-23 11:36:14 +02:00
parent 166a82ca6a
commit c7895ba320
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ospfd/ospf_snmp.c
View file

@ -906,7 +906,7 @@ static struct ospf_lsa *ospfLsdbLookup(struct variable *v, oid *name,
area = ospf_area_lookup_by_area_id(ospf, *area_id); area = ospf_area_lookup_by_area_id(ospf, *area_id);
if (!area) if (!area)
return NULL; return NULL;
offset++; offset += IN_ADDR_SIZE;
/* Type. */ /* Type. */
*type = *offset; *type = *offset;
@ -914,7 +914,7 @@ static struct ospf_lsa *ospfLsdbLookup(struct variable *v, oid *name,
/* LS ID. */ /* LS ID. */
oid2in_addr(offset, IN_ADDR_SIZE, ls_id); oid2in_addr(offset, IN_ADDR_SIZE, ls_id);
offset++; offset += IN_ADDR_SIZE;
/* Router ID. */ /* Router ID. */
oid2in_addr(offset, IN_ADDR_SIZE, router_id); oid2in_addr(offset, IN_ADDR_SIZE, router_id);
@ -971,7 +971,7 @@ static struct ospf_lsa *ospfLsdbLookup(struct variable *v, oid *name,
} }
/* Router ID. */ /* Router ID. */
offset++; offset += IN_ADDR_SIZE;
offsetlen -= IN_ADDR_SIZE; offsetlen -= IN_ADDR_SIZE;
len = offsetlen; len = offsetlen;
@ -996,11 +996,11 @@ static struct ospf_lsa *ospfLsdbLookup(struct variable *v, oid *name,
/* Fill in value. */ /* Fill in value. */
offset = name + v->namelen; offset = name + v->namelen;
oid_copy_in_addr(offset, area_id); oid_copy_in_addr(offset, area_id);
offset++; offset += IN_ADDR_SIZE;
*offset = lsa->data->type; *offset = lsa->data->type;
offset++; offset++;
oid_copy_in_addr(offset, &lsa->data->id); oid_copy_in_addr(offset, &lsa->data->id);
offset++; offset += IN_ADDR_SIZE;
oid_copy_in_addr(offset, oid_copy_in_addr(offset,
&lsa->data->adv_router); &lsa->data->adv_router);
@ -1106,7 +1106,7 @@ static struct ospf_area_range *ospfAreaRangeLookup(struct variable *v,
if (!area) if (!area)
return NULL; return NULL;
offset++; offset += IN_ADDR_SIZE;
/* Lookup area range. */ /* Lookup area range. */
oid2in_addr(offset, IN_ADDR_SIZE, range_net); oid2in_addr(offset, IN_ADDR_SIZE, range_net);
@ -1135,7 +1135,7 @@ static struct ospf_area_range *ospfAreaRangeLookup(struct variable *v,
return NULL; return NULL;
do { do {
offset++; offset += IN_ADDR_SIZE;
offsetlen -= IN_ADDR_SIZE; offsetlen -= IN_ADDR_SIZE;
len = offsetlen; len = offsetlen;
@ -1157,7 +1157,7 @@ static struct ospf_area_range *ospfAreaRangeLookup(struct variable *v,
/* Fill in value. */ /* Fill in value. */
offset = name + v->namelen; offset = name + v->namelen;
oid_copy_in_addr(offset, area_id); oid_copy_in_addr(offset, area_id);
offset++; offset += IN_ADDR_SIZE;
oid_copy_in_addr(offset, range_net); oid_copy_in_addr(offset, range_net);
return range; return range;
@ -1559,7 +1559,7 @@ static struct ospf_interface *ospfIfLookup(struct variable *v, oid *name,
*length = v->namelen + IN_ADDR_SIZE + 1; *length = v->namelen + IN_ADDR_SIZE + 1;
offset = name + v->namelen; offset = name + v->namelen;
oid_copy_in_addr(offset, ifaddr); oid_copy_in_addr(offset, ifaddr);
offset++; offset += IN_ADDR_SIZE;
*offset = *ifindex; *offset = *ifindex;
return oi; return oi;
} }
@ -1703,7 +1703,7 @@ static struct ospf_interface *ospfIfMetricLookup(struct variable *v, oid *name,
*length = v->namelen + IN_ADDR_SIZE + 1 + 1; *length = v->namelen + IN_ADDR_SIZE + 1 + 1;
offset = name + v->namelen; offset = name + v->namelen;
oid_copy_in_addr(offset, ifaddr); oid_copy_in_addr(offset, ifaddr);
offset++; offset += IN_ADDR_SIZE;
*offset = *ifindex; *offset = *ifindex;
offset++; offset++;
*offset = OSPF_SNMP_METRIC_VALUE; *offset = OSPF_SNMP_METRIC_VALUE;
@ -2241,7 +2241,7 @@ static struct ospf_lsa *ospfExtLsdbLookup(struct variable *v, oid *name,
/* LS ID. */ /* LS ID. */
oid2in_addr(offset, IN_ADDR_SIZE, ls_id); oid2in_addr(offset, IN_ADDR_SIZE, ls_id);
offset++; offset += IN_ADDR_SIZE;
/* Router ID. */ /* Router ID. */
oid2in_addr(offset, IN_ADDR_SIZE, router_id); oid2in_addr(offset, IN_ADDR_SIZE, router_id);
@ -2269,7 +2269,7 @@ static struct ospf_lsa *ospfExtLsdbLookup(struct variable *v, oid *name,
oid2in_addr(offset, len, ls_id); oid2in_addr(offset, len, ls_id);
offset++; offset += IN_ADDR_SIZE;
offsetlen -= IN_ADDR_SIZE; offsetlen -= IN_ADDR_SIZE;
/* Router ID. */ /* Router ID. */
@ -2292,7 +2292,7 @@ static struct ospf_lsa *ospfExtLsdbLookup(struct variable *v, oid *name,
*offset = OSPF_AS_EXTERNAL_LSA; *offset = OSPF_AS_EXTERNAL_LSA;
offset++; offset++;
oid_copy_in_addr(offset, &lsa->data->id); oid_copy_in_addr(offset, &lsa->data->id);
offset++; offset += IN_ADDR_SIZE;
oid_copy_in_addr(offset, &lsa->data->adv_router); oid_copy_in_addr(offset, &lsa->data->adv_router);
return lsa; return lsa;