summaryrefslogtreecommitdiffstats
path: root/ospfd/ospf_opaque.c
diff options
context:
space:
mode:
authorOlivier Dugeon <olivier.dugeon@orange.com>2021-04-06 12:09:25 +0200
committerOlivier Dugeon <olivier.dugeon@orange.com>2021-05-19 09:48:54 +0200
commit8db278b5e3e2b1a8b2d8ac85789565d5dd268ac6 (patch)
treee36fe5d6cb6329b2b649f0360554213fa78979dc /ospfd/ospf_opaque.c
parentMerge pull request #8688 from idryzhov/bgp-vrf-bind-priv (diff)
downloadfrr-8db278b5e3e2b1a8b2d8ac85789565d5dd268ac6.tar.xz
frr-8db278b5e3e2b1a8b2d8ac85789565d5dd268ac6.zip
ospfd: Correct Coverity defects
When browsing or parsing OSPF LSA TLVs, we need to use the LSA length which is part of the LSA header. This length, encoded in 16 bits, must be first converted to host byte order with ntohs() function. However, Coverity Scan considers that ntohs() function return TAINTED data. Thus, when the length is used to control for() loop, Coverity Scan marks this part of the code as defect with "Untrusted Loop Bound" due to the usage of Tainted variable. Similar problems occur when browsing sub-TLV where length is extracted with ntohs(). To overcome this limitation, a size attribute has been added to the ospf_lsa structure. The size is set when lsa->data buffer is allocated. In addition, when an OSPF packet is received, the size of the payload is controlled before contains is processed. For OSPF LSA, this allow a secure buffer allocation. Thus, new size attribute contains the exact buffer allocation allowing a strict control during TLV browsing. This patch adds extra control to bound for() loop during TLV browsing to avoid potential problem as suggested by Coverity Scan. Controls are based on new size attribute of the ospf_lsa structure to avoid any ambiguity. Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'ospfd/ospf_opaque.c')
-rw-r--r--ospfd/ospf_opaque.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index ae9ab48d4..42bf914f6 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -1204,9 +1204,10 @@ void show_opaque_info_detail(struct vty *vty, struct ospf_lsa *lsa,
void ospf_opaque_lsa_dump(struct stream *s, uint16_t length)
{
- struct ospf_lsa lsa;
+ struct ospf_lsa lsa = {};
lsa.data = (struct lsa_header *)stream_pnt(s);
+ lsa.size = length;
show_opaque_info_detail(NULL, &lsa, NULL);
return;
}