Message ID | 1480596283-204869-1-git-send-email-sowmini.varadhan@oracle.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 12/1/2016 4:44 AM, Sowmini Varadhan wrote: > If some error is encountered in rds_tcp_init_net, make sure to > unregister_netdevice_notifier(), else we could trigger a panic > later on, when the modprobe from a netns fails. > > Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> > --- Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
From: Sowmini Varadhan <sowmini.varadhan@oracle.com> Date: Thu, 1 Dec 2016 04:44:43 -0800 > If some error is encountered in rds_tcp_init_net, make sure to > unregister_netdevice_notifier(), else we could trigger a panic > later on, when the modprobe from a netns fails. > > Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Applied, thank you.
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index fcddacc..20e2923 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -659,6 +659,8 @@ static int rds_tcp_init(void) out_pernet: unregister_pernet_subsys(&rds_tcp_net_ops); out_slab: + if (unregister_netdevice_notifier(&rds_tcp_dev_notifier)) + pr_warn("could not unregister rds_tcp_dev_notifier\n"); kmem_cache_destroy(rds_tcp_conn_slab); out: return ret;
If some error is encountered in rds_tcp_init_net, make sure to unregister_netdevice_notifier(), else we could trigger a panic later on, when the modprobe from a netns fails. Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> --- net/rds/tcp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)