diff options
| author |   Cong Wang <xiyou.wangcong@gmail.com> | 2019-07-03 17:21:13 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-05 15:22:27 -0700 |
| commit | b9a1e627405d68d475a3c1f35e685ccfb5bbe668 (patch) | |
| tree | 4130c796a3b6477e01126514e08f9cb2fc91f4b6 /net/hsr/hsr_netlink.c | |
| parent | hsr: fix a memory leak in hsr_del_port() (diff) | |
| download | linux-dev-b9a1e627405d68d475a3c1f35e685ccfb5bbe668.tar.xz linux-dev-b9a1e627405d68d475a3c1f35e685ccfb5bbe668.zip | |
hsr: implement dellink to clean up resources
hsr_link_ops implements ->newlink() but not ->dellink(),
which leads that resources not released after removing the device,
particularly the entries in self_node_db and node_db.
So add ->dellink() implementation to replace the priv_destructor.
This also makes the code slightly easier to understand.
Reported-by: syzbot+c6167ec3de7def23d1e8@syzkaller.appspotmail.com
Cc: Arvid Brodin <arvid.brodin@alten.se>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/hsr/hsr_netlink.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index 8f8337f893ba..160edd24de4e 100644 --- a/net/hsr/hsr_netlink.c +++ b/net/hsr/hsr_netlink.c @@ -69,6 +69,12 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev, return hsr_dev_finalize(dev, link, multicast_spec, hsr_version); } +static void hsr_dellink(struct net_device *hsr_dev, struct list_head *head) +{ + hsr_dev_destroy(hsr_dev); + unregister_netdevice_queue(hsr_dev, head); +} + static int hsr_fill_info(struct sk_buff *skb, const struct net_device *dev) { struct hsr_priv *hsr; @@ -113,6 +119,7 @@ static struct rtnl_link_ops hsr_link_ops __read_mostly = { .priv_size = sizeof(struct hsr_priv), .setup = hsr_dev_setup, .newlink = hsr_newlink, + .dellink = hsr_dellink, .fill_info = hsr_fill_info, }; |