ipv4: Handle RTA_GATEWAY set to 0
Subsystems (3)
David Ahern
maintainerPATCH 1/1 ipv4: Handle RTA_GATEWAY set to 0
From: David Ahern <[email protected]>
Govindarajulu reported a regression with Network Manager which sends an RTA_GATEWAY attribute with the address set to 0. Fixup the handling of RTA_GATEWAY to only set fc_gw_family if the gateway address is actually set.
--- net/ipv4/fib_frontend.c | 3 ++- net/ipv4/fib_semantics.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
net/ipv4/fib_frontend.c +2 -1
@@ -755,8 +755,9 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,break ;case RTA_GATEWAY : has_gw = true; - cfg->fc_gw_family =AF_INET ; cfg->fc_gw4 =nla_get_be32 (attr); +if (cfg->fc_gw4) + cfg->fc_gw_family =AF_INET ;break ;case RTA_VIA : has_via = true;
net/ipv4/fib_semantics.c +2 -1
@@ -616,8 +616,9 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,return -EINVAL ; }if (nla) { - fib_cfg.fc_gw_family =AF_INET ; fib_cfg.fc_gw4 =nla_get_in_addr (nla); +if (fib_cfg.fc_gw4) + fib_cfg.fc_gw_family =AF_INET ; }else if (nlav) { ret =fib_gw_from_via (&fib_cfg, nlav, extack);if (ret)
Signature · 1 line
2.11.0
From: David Ahern <[email protected]>
Date: Wed, 10 Apr 2019 10:05:51 -0700
Quoted 10 lines
From: David Ahern <[email protected]>
Govindarajulu reported a regression with Network Manager which sends an
RTA_GATEWAYattribute with the address set to 0. Fixup the handling ofRTA_GATEWAYto only setfc_gw_familyif the gateway address is actually set.Fixes f35b794b3b405 ("ipv4: Prepare fib_config for IPv6 gateway")Reported-by Govindarajulu Varadarajan <[email protected]>Signed-off-by David Ahern <[email protected]>
Applied, thanks for following up on this so quickly.
Quoted 11 lines · David Ahern
From: David Ahern <[email protected]>
Govindarajulu reported a regression with Network Manager which sends an
RTA_GATEWAYattribute with the address set to 0. Fixup the handling ofRTA_GATEWAYto only setfc_gw_familyif the gateway address is actually set.Fixes f35b794b3b405 ("ipv4: Prepare fib_config for IPv6 gateway")Reported-by Govindarajulu Varadarajan <[email protected]>Signed-off-by David Ahern <[email protected]>
This fixes the issue I was facing.
Thanks David.