| Message ID | 1501146109-30032-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
Hi Hangbin, On Thu, Jul 27, 2017 at 05:01:49PM +0800, Hangbin Liu wrote: [...] > diff --git a/lib/utils.c b/lib/utils.c > index e77bd30..0479e00 100644 > --- a/lib/utils.c > +++ b/lib/utils.c > @@ -1215,5 +1215,6 @@ 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; > + return (rtm_family == RTNL_FAMILY_IPMR || > + rtm_family == AF_INET) ? AF_INET : AF_INET6; > } I think this is not very readable. How about this instead: - return rtm_family == RTNL_FAMILY_IPMR ? AF_INET : AF_INET6; + if (rtm_family == RTNL_FAMILY_IPMR) + return AF_INET; + + return rtm_family; Thanks, Phil
diff --git a/lib/utils.c b/lib/utils.c index e77bd30..0479e00 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1215,5 +1215,6 @@ 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; + return (rtm_family == RTNL_FAMILY_IPMR || + rtm_family == AF_INET) ? AF_INET : AF_INET6; }
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 <liuhangbin@gmail.com> --- lib/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)