]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
geneve: fix an uninitialized value in geneve_changelink()
authorCong Wang <xiyou.wangcong@gmail.com>
Thu, 23 Jul 2020 01:56:25 +0000 (18:56 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jul 2020 08:18:35 +0000 (10:18 +0200)
[ 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+7ebc2e088af5e4c0c9fa@syzkaller.appspotmail.com
Cc: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/geneve.c

index 19d9d78a6df2c31aab9c5811c8e615c877c4fb3c..adfdf6260b269892fc184dec33fd43f91917ecc4 100644 (file)
@@ -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;