From: Cong Wang <xiyou.wangc...@gmail.com>

[ Upstream commit 32818c075c54bb0cae44dd6f7ab00b01c52b8372 ]

geneve_nl2info() sets 'df' conditionally, so we have to
initialize it by copying the value from existing geneve
device in geneve_changelink().

Fixes: 56c09de347e4 ("geneve: allow changing DF behavior after creation")
Reported-by: syzbot+7ebc2e088af5e4c0c...@syzkaller.appspotmail.com
Cc: Sabrina Dubroca <s...@queasysnail.net>
Signed-off-by: Cong Wang <xiyou.wangc...@gmail.com>
Reviewed-by: Sabrina Dubroca <s...@queasysnail.net>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/net/geneve.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 4661ef865807f..dec52b763d508 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -1615,11 +1615,11 @@ static int geneve_changelink(struct net_device *dev, 
struct nlattr *tb[],
                             struct netlink_ext_ack *extack)
 {
        struct geneve_dev *geneve = netdev_priv(dev);
+       enum ifla_geneve_df df = geneve->df;
        struct geneve_sock *gs4, *gs6;
        struct ip_tunnel_info info;
        bool metadata;
        bool use_udp6_rx_checksums;
-       enum ifla_geneve_df df;
        bool ttl_inherit;
        int err;
 
-- 
2.25.1



Reply via email to