Merge pull request #4958 from donaldsharp/pim_assert_a_saurus

pimd: Slightly loosen pim assert message length tests
This commit is contained in:
Jafar Al-Gharaibeh 2019-09-10 13:21:29 -05:00 committed by GitHub
commit ba439635c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -259,11 +259,11 @@ int pim_assert_recv(struct interface *ifp, struct pim_neighbor *neigh,
curr += offset;
curr_size -= offset;
if (curr_size != 8) {
if (curr_size < 8) {
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
zlog_warn(
"%s: preference/metric size is not 8: size=%d from %s on interface %s",
"%s: preference/metric size is less than 8 bytes: size=%d from %s on interface %s",
__PRETTY_FUNCTION__, curr_size, src_str, ifp->name);
return -3;
}