| Message ID | 1501148655-32629-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Thu, Jul 27, 2017 at 05:44:15PM +0800, Hangbin Liu wrote: > 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> Acked-by: Phil Sutter <phil@nwl.cc>
On Thu, 27 Jul 2017 12:03:02 +0200 Phil Sutter <phil@nwl.cc> wrote: > On Thu, Jul 27, 2017 at 05:44:15PM +0800, Hangbin Liu wrote: > > 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> > > Acked-by: Phil Sutter <phil@nwl.cc> Applied, thanks.
diff --git a/lib/utils.c b/lib/utils.c index e77bd30..9aa3219 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; }
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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)