| Message ID | 20200723015625.19255-1-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] geneve: fix an uninitialized value in geneve_changelink() | expand |
2020-07-22, 18:56:25 -0700, Cong Wang wrote: > 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> Ouch. Thanks for fixing this. Reviewed-by: Sabrina Dubroca <sd@queasysnail.net> This should only be needed in net/stable. In net-next, I removed this in commit 9e06e8596bc8 (which will conflict with this patch).
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Wed, 22 Jul 2020 18:56:25 -0700 > 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> Applied and queued up for -stable, thanks Cong.
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 4661ef865807..dec52b763d50 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;
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> --- drivers/net/geneve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)