From: Hangbin Liu Date: Thu, 27 Jul 2017 09:44:15 +0000 (+0800) Subject: utils: return default family when rtm_family is not RTNL_FAMILY_IPMR/IP6MR X-Git-Tag: v4.13.0~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ce897a03bfda76dc66dc1acfa014fc0e3d3022a;p=thirdparty%2Fiproute2.git utils: return default family when rtm_family is not RTNL_FAMILY_IPMR/IP6MR When we get a multicast route, the rtm_type is RTN_MULTICAST, but the rtm_family may be AF_INET. If we only check the type with RTNL_FAMILY_IPMR, we will get malformed address. e.g. + ip -4 route add multicast 172.111.1.1 dev em1 table main Before fix: + ip route list type multicast table main multicast ac6f:101:800:400:400:0:3c00:0 dev em1 scope link After fix: + ip route list type multicast table main multicast 172.111.1.1 dev em1 scope link Fixes: 56e3eb4c3400 ("ip: route: fix multicast route dumps") Signed-off-by: Hangbin Liu Acked-by: Phil Sutter --- diff --git a/lib/utils.c b/lib/utils.c index e77bd3025..9aa3219c5 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1215,5 +1215,11 @@ int get_real_family(int rtm_type, int rtm_family) if (rtm_type != RTN_MULTICAST) return rtm_family; - return rtm_family == RTNL_FAMILY_IPMR ? AF_INET : AF_INET6; + if (rtm_family == RTNL_FAMILY_IPMR) + return AF_INET; + + if (rtm_family == RTNL_FAMILY_IP6MR) + return AF_INET6; + + return rtm_family; }