netdev - [PATCH net] vrf: fix vrf driver unloading

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 25 May 2022 23:46:28 +0300
From:   Eyal Birger <eyal.birger@...il.com>
To:     dsahern@...nel.org, davem@...emloft.net, edumazet@...gle.com,
        kuba@...nel.org, pabeni@...hat.com
Cc:     netdev@...r.kernel.org, Eyal Birger <eyal.birger@...il.com>
Subject: [PATCH net] vrf: fix vrf driver unloading

The commit referenced in the "Fixes" tag has removed the vrf driver
cleanup function leading to a "Device or resource busy" error when
trying to rmmod vrf.

Fix by re-introducing the cleanup function with the relevant changes.

Fixes: 9ab179d83b4e ("net: vrf: Fix dst reference counting")
Signed-off-by: Eyal Birger <eyal.birger@...il.com>

----

Note: the commit message in 9ab179d83b4e did not document it
and it is not apparent to me why the ability to rmmod the driver is
linked to that change, but maybe there's some hidden reason.
---
 drivers/net/vrf.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index cfc30ce4c6e1..7dff865d7283 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -2064,7 +2064,17 @@ static int __init vrf_init_module(void)
 	return rc;
 }
 
+static void __exit vrf_cleanup_module(void)
+{
+	rtnl_link_unregister(&vrf_link_ops);
+	l3mdev_table_lookup_unregister(L3MDEV_TYPE_VRF,
+				       vrf_ifindex_lookup_by_table_id);
+	unregister_pernet_subsys(&vrf_net_ops);
+	unregister_netdevice_notifier(&vrf_notifier_block);
+}
+
 module_init(vrf_init_module);
+module_exit(vrf_cleanup_module);
 MODULE_AUTHOR("Shrijeet Mukherjee, David Ahern");
 MODULE_DESCRIPTION("Device driver to instantiate VRF domains");
 MODULE_LICENSE("GPL");
-- 
2.34.1