net: openvswitch: fixes crash if nf_conncount_init() fails
Subsystems (3)
Eelco Chaudron
maintainerPATCH 1/1 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.
--- net/openvswitch/datapath.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/openvswitch/datapath.c +7 -1
@@ -2476,13 +2476,19 @@ static int __init dp_register_genl(void)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,
Quoted 8 lines · Eelco Chaudron
If
nf_conncount_initfails 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 <[email protected]>Signed-off-by Eelco Chaudron <[email protected]>
Quoted 34 lines
--- net/openvswitch/datapath.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)net/openvswitch/datapath.c +7
-1@@ -2476,13 +2476,19 @@ static int __init dp_register_genl(void)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,_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Signature · 1 line
Best regards, Tonghao
From: Eelco Chaudron <[email protected]>
Date: Mon, 31 Aug 2020 11:57:57 +0200
Quoted 7 lines
If
nf_conncount_initfails 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 <[email protected]>Signed-off-by Eelco Chaudron <[email protected]>
Applied, thank you.