From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 14 Oct 2020 23:19:39 +0000 (-0400)
Subject: Merge pull request #7309 from mjstapp/fix_ospf_gr_reasons
X-Git-Tag: base_7.6~412
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2c6592c1405808e95dc43e298a9ec4446e9cbdd1;p=matthieu%2Ffrr.git

Merge pull request #7309 from mjstapp/fix_ospf_gr_reasons

ospfd: make GR reason string production safer
---

2c6592c1405808e95dc43e298a9ec4446e9cbdd1
diff --cc ospfd/ospf_gr_helper.c
index bf6a45bcdb,391c802404..616013fb9e
--- a/ospfd/ospf_gr_helper.c
+++ b/ospfd/ospf_gr_helper.c
@@@ -1018,17 -982,9 +1052,17 @@@ static void show_ospf_grace_lsa_info(st
  			sum += TLV_SIZE(tlvh);
  
  			vty_out(vty, "   Restart reason:%s\n",
- 				ospf_restart_reason_desc[grReason->reason]);
+ 				ospf_restart_reason2str(grReason->reason));
  			break;
  		case RESTARTER_IP_ADDR_TYPE:
 +			if (TLV_SIZE(tlvh) <
 +			    sizeof(struct grace_tlv_restart_addr)) {
 +				vty_out(vty,
 +					"%% Invalid addr TLV length %zu\n",
 +					TLV_SIZE(tlvh));
 +				return;
 +			}
 +
  			restartAddr = (struct grace_tlv_restart_addr *)tlvh;
  			sum += TLV_SIZE(tlvh);