proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-19 05:57:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10334 from mobash-rasool/igmp-conf-fix

Browse Source 
pimd: IGMP messages may be longer than 8 octets
This commit is contained in:
Donald Sharp 2022-01-13 09:00:51 -05:00 committed by GitHub
commit a64abeefdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pimd/pim_igmpv2.c
View File

@ -115,10 +115,11 @@ int igmp_v2_recv_report(struct gm_sock *igmp, struct in_addr from,
return 0; return 0;
if (igmp_msg_len != IGMP_V12_MSG_SIZE) { if (igmp_msg_len != IGMP_V12_MSG_SIZE) {
zlog_warn( if (PIM_DEBUG_IGMP_PACKETS)
zlog_debug(
"Recv IGMPv2 REPORT from %s on %s: size=%d other than correct=%d", "Recv IGMPv2 REPORT from %s on %s: size=%d other than correct=%d",
from_str, ifp->name, igmp_msg_len, IGMP_V12_MSG_SIZE); from_str, ifp->name, igmp_msg_len,
return -1; IGMP_V12_MSG_SIZE);
} }
if (igmp_validate_checksum(igmp_msg, igmp_msg_len) == -1) { if (igmp_validate_checksum(igmp_msg, igmp_msg_len) == -1) {
@ -172,10 +173,11 @@ int igmp_v2_recv_leave(struct gm_sock *igmp, struct ip *ip_hdr,
return 0; return 0;
if (igmp_msg_len != IGMP_V12_MSG_SIZE) { if (igmp_msg_len != IGMP_V12_MSG_SIZE) {
zlog_warn( if (PIM_DEBUG_IGMP_PACKETS)
zlog_debug(
"Recv IGMPv2 LEAVE from %s on %s: size=%d other than correct=%d", "Recv IGMPv2 LEAVE from %s on %s: size=%d other than correct=%d",
from_str, ifp->name, igmp_msg_len, IGMP_V12_MSG_SIZE); from_str, ifp->name, igmp_msg_len,
return -1; IGMP_V12_MSG_SIZE);
} }
if (igmp_validate_checksum(igmp_msg, igmp_msg_len) == -1) { if (igmp_validate_checksum(igmp_msg, igmp_msg_len) == -1) {