proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 08:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9552 from mobash-rasool/ospfv2-bug-fixes-03

Browse Source 
ospfd: ANVL Test case 25.22, 25.23 and 28.11 fixes
This commit is contained in:
Russ White 2021-09-07 10:46:33 -04:00 committed by GitHub
commit 91aaac3ac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ospfd/ospf_lsa.c
View File

@ -2954,6 +2954,32 @@ static int ospf_maxage_lsa_remover(struct thread *thread)
return 0;
}
/* This function checks whether an LSA with initial sequence number should be
* originated after a wrap in sequence number
*/
void ospf_check_and_gen_init_seq_lsa(struct ospf_interface *oi,
struct ospf_lsa *recv_lsa)
{
struct ospf_lsa *lsa = NULL;
struct ospf *ospf = oi->ospf;
lsa = ospf_lsa_lookup_by_header(oi->area, recv_lsa->data);
if ((lsa == NULL) || (!CHECK_FLAG(lsa->flags, OSPF_LSA_PREMATURE_AGE))
|| (lsa->retransmit_counter != 0)) {
if (IS_DEBUG_OSPF(lsa, LSA))
zlog_debug(
"Do not generate LSA with initial seqence number.");
return;
}
ospf_lsa_maxage_delete(ospf, lsa);
lsa->data->ls_seqnum = lsa_seqnum_increment(lsa);
ospf_lsa_refresh(ospf, lsa);
}
void ospf_lsa_maxage_delete(struct ospf *ospf, struct ospf_lsa *lsa)
{
struct route_node *rn;

4
ospfd/ospf_lsa.h
View File

@ -218,6 +218,8 @@ struct as_external_lsa {
#define LS_AGE(x) (OSPF_LSA_MAXAGE < get_age(x) ? OSPF_LSA_MAXAGE : get_age(x))
#define IS_LSA_SELF(L) (CHECK_FLAG ((L)->flags, OSPF_LSA_SELF))
#define IS_LSA_MAXAGE(L) (LS_AGE ((L)) == OSPF_LSA_MAXAGE)
#define IS_LSA_MAX_SEQ(L) \
((L)->data->ls_seqnum == htonl(OSPF_MAX_SEQUENCE_NUMBER))
#define OSPF_LSA_UPDATE_DELAY 2
@ -347,6 +349,8 @@ extern struct ospf_lsa *ospf_translated_nssa_refresh(struct ospf *ospf,
extern struct ospf_lsa *ospf_translated_nssa_originate(struct ospf *ospf,
struct ospf_lsa *type7,
struct ospf_lsa *type5);
extern void ospf_check_and_gen_init_seq_lsa(struct ospf_interface *oi,
struct ospf_lsa *lsa);
extern void ospf_flush_lsa_from_area(struct ospf *ospf, struct in_addr area_id,
int type);
#endif /* _ZEBRA_OSPF_LSA_H */

11
ospfd/ospf_packet.c
View File

@ -2089,11 +2089,10 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
if (current == NULL
|| (ret = ospf_lsa_more_recent(current, lsa)) < 0) {
/* CVE-2017-3224 */
if (current && (lsa->data->ls_seqnum ==
htonl(OSPF_MAX_SEQUENCE_NUMBER)
&& !IS_LSA_MAXAGE(lsa))) {
if (current && (IS_LSA_MAX_SEQ(current))
&& (IS_LSA_MAX_SEQ(lsa)) && !IS_LSA_MAXAGE(lsa)) {
zlog_debug(
"Link State Update[%s]: has Max Seq but not MaxAge. Dropping it",
"Link State Update[%s]: has Max Seq and higher checksum but not MaxAge. Dropping it",
dump_lsa_key(lsa));
DISCARD_LSA(lsa, 4);
@ -2271,8 +2270,10 @@ static void ospf_ls_ack(struct ip *iph, struct ospf_header *ospfh,
lsr = ospf_ls_retransmit_lookup(nbr, lsa);
if (lsr != NULL && ospf_lsa_more_recent(lsr, lsa) == 0)
if (lsr != NULL && ospf_lsa_more_recent(lsr, lsa) == 0) {
ospf_ls_retransmit_delete(nbr, lsr);
ospf_check_and_gen_init_seq_lsa(oi, lsa);
}
lsa->data = NULL;
ospf_lsa_discard(lsa);