diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2019-12-22 12:45:00 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-22 12:45:00 -0600 |
| commit | 1a457dcffd5876beee6d5a7d2da9cf335d305ab8 (patch) | |
| tree | fba803c003f685917fd5ce736a3ba28528beb35b | |
| parent | 959abfc76eed9bad28f3fa6925e685990befbff8 (diff) | |
| parent | f08e6750740b1152fc140868213f66aa79e1d00a (diff) | |
Merge pull request #5584 from qlyoung/pim-fix-iph-trust
pimd: readd iph length checks
| -rw-r--r-- | pimd/pim_igmp.c | 22 | ||||
| -rw-r--r-- | pimd/pim_mroute.c | 3 |
2 files changed, 18 insertions, 7 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index 3602d98a3e..54ad17a991 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -478,10 +478,24 @@ int pim_igmp_packet(struct igmp_sock *igmp, char *buf, size_t len) ip_hlen = ip_hdr->ip_hl << 2; /* ip_hl gives length in 4-byte words */ + if (ip_hlen > len) { + zlog_warn( + "IGMP packet header claims size %zu, but we only have %zu bytes", + ip_hlen, len); + return -1; + } + igmp_msg = buf + ip_hlen; - msg_type = *igmp_msg; igmp_msg_len = len - ip_hlen; + if (igmp_msg_len < PIM_IGMP_MIN_LEN) { + zlog_warn("IGMP message size=%d shorter than minimum=%d", + igmp_msg_len, PIM_IGMP_MIN_LEN); + return -1; + } + + msg_type = *igmp_msg; + if (PIM_DEBUG_IGMP_PACKETS) { zlog_debug( "Recv IGMP packet from %s to %s on %s: size=%zu ttl=%d msg_type=%d msg_size=%d", @@ -489,12 +503,6 @@ int pim_igmp_packet(struct igmp_sock *igmp, char *buf, size_t len) msg_type, igmp_msg_len); } - if (igmp_msg_len < PIM_IGMP_MIN_LEN) { - zlog_warn("IGMP message size=%d shorter than minimum=%d", - igmp_msg_len, PIM_IGMP_MIN_LEN); - return -1; - } - switch (msg_type) { case PIM_IGMP_MEMBERSHIP_QUERY: { int max_resp_code = igmp_msg[1]; diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 1fe2289a8e..3459abbc19 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -590,6 +590,9 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf, struct in_addr ifaddr; struct igmp_sock *igmp; + if (buf_size < (int)sizeof(struct ip)) + return 0; + ip_hdr = (const struct ip *)buf; if (ip_hdr->ip_p == IPPROTO_IGMP) { |