From: paco <paco@voltanet.io>
Date: Fri, 15 Jun 2018 10:57:47 +0000 (+0200)
Subject: pimd: Untrusted val as argument (Coverity 1465491)
X-Git-Tag: frr-6.1-dev~311^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=18e994a0437cfba9f4c09bd62293e13e49ea774b;p=mirror%2Ffrr.git

pimd: Untrusted val as argument (Coverity 1465491)

Signed-off-by: F. Aragon <paco@voltanet.io>
---

diff --git a/pimd/mtracebis.c b/pimd/mtracebis.c
index a073fa70be..731fdb1beb 100644
--- a/pimd/mtracebis.c
+++ b/pimd/mtracebis.c
@@ -296,6 +296,10 @@ static int recv_response(int fd, int *hops, struct igmp_mtrace *mtracer)
 
 	mtrace_len = ntohs(ip->ip_len) - ip->ip_hl * 4;
 
+	if ((char *)mtrace + mtrace_len
+	    > (char *)mtrace_buf + IP_AND_MTRACE_BUF_LEN)
+		return -1;
+
 	if (mtrace_len < (int)MTRACE_HDR_SIZE)
 		return -1;