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

Merge pull request #3657 from nitinsoniism/ospf_mtu_crash

Browse Source 
ospfd: ospfd core if hello packet exceeds link MTU
This commit is contained in:
Russ White 2019-01-29 09:58:53 -05:00 committed by GitHub
commit 3bce6932ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ospfd/ospf_errors.c
View File

@ -169,6 +169,15 @@ static struct log_ref ferr_ospf_err[] = {
.description = "OSPF has attempted to change states when it should not be able to", .description = "OSPF has attempted to change states when it should not be able to",
.suggestion = "Gather log files and open an issue", .suggestion = "Gather log files and open an issue",
}, },
{
.code = EC_OSPF_LARGE_HELLO,
.title = "OSPF Encountered a Large Hello",
.description = "OSPF attempted to send a Hello larger than MTU "
"but did not",
.suggestion = "Too many neighbors configured on a single interface."
" Suggestion is to decrease the number of neighbors on"
" a single interface/subnet"
},
{ {
.code = END_FERR, .code = END_FERR,
} }

1
ospfd/ospf_errors.h
View File

@ -47,6 +47,7 @@ enum ospf_log_refs {
EC_OSPF_LSA_MISSING, EC_OSPF_LSA_MISSING,
EC_OSPF_PTP_NEIGHBOR, EC_OSPF_PTP_NEIGHBOR,
EC_OSPF_LSA_SIZE, EC_OSPF_LSA_SIZE,
EC_OSPF_LARGE_HELLO,
}; };
extern void ospf_error_init(void); extern void ospf_error_init(void);

15
ospfd/ospf_packet.c
View File

@ -3309,6 +3309,16 @@ static int ospf_make_hello(struct ospf_interface *oi, struct stream *s)
.prefix4)) .prefix4))
flag = 1; flag = 1;
/* Hello packet overflows interface MTU. */
if (length + sizeof(uint32_t)
> ospf_packet_max(oi)) {
flog_err(
EC_OSPF_LARGE_HELLO,
"Oversized Hello packet!"
" Larger than MTU. Not sending it out");
return 0;
}
stream_put_ipv4( stream_put_ipv4(
s, s,
nbr->router_id nbr->router_id
@ -3578,6 +3588,11 @@ static void ospf_hello_send_sub(struct ospf_interface *oi, in_addr_t addr)
/* Prepare OSPF Hello body. */ /* Prepare OSPF Hello body. */
length += ospf_make_hello(oi, op->s); length += ospf_make_hello(oi, op->s);
if (length == OSPF_HEADER_SIZE) {
/* Hello overshooting MTU */
ospf_packet_free(op);
return;
}
/* Fill OSPF header. */ /* Fill OSPF header. */
ospf_fill_header(oi, op->s, length); ospf_fill_header(oi, op->s, length);