diff options
| author | Eelco Chaudron <echaudro@redhat.com> | 2020-08-31 11:57:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-01 13:23:23 -0700 |
| commit | e0afe91443a5fddef9213e7f429ab7f12756e769 (patch) | |
| tree | b8b7a51e31d37a0cbb19fd8afbe84f747ec9efac /net/openvswitch | |
| parent | 36a782fdcc2bfe39265ac4640f29404493b52a55 (diff) | |
| download | linux-e0afe91443a5fddef9213e7f429ab7f12756e769.tar.gz linux-e0afe91443a5fddef9213e7f429ab7f12756e769.tar.bz2 linux-e0afe91443a5fddef9213e7f429ab7f12756e769.zip | |
net: openvswitch: fixes crash if nf_conncount_init() fails
If nf_conncount_init fails currently the dispatched work is not canceled,
causing problems when the timer fires. This change fixes this by not
scheduling the work until all initialization is successful.
Fixes: a65878d6f00b ("net: openvswitch: fixes potential deadlock in dp cleanup code")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Reviewed-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/datapath.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index bf701b7a394b..00df39b736ed 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -2481,13 +2481,19 @@ error: static int __net_init ovs_init_net(struct net *net) { struct ovs_net *ovs_net = net_generic(net, ovs_net_id); + int err; INIT_LIST_HEAD(&ovs_net->dps); INIT_WORK(&ovs_net->dp_notify_work, ovs_dp_notify_wq); INIT_DELAYED_WORK(&ovs_net->masks_rebalance, ovs_dp_masks_rebalance); + + err = ovs_ct_init(net); + if (err) + return err; + schedule_delayed_work(&ovs_net->masks_rebalance, msecs_to_jiffies(DP_MASKS_REBALANCE_INTERVAL)); - return ovs_ct_init(net); + return 0; } static void __net_exit list_vports_from_net(struct net *net, struct net *dnet, |