hsr: fix a memory leak in hsr_del_port()

hsr_del_port() should release all the resources allocated
in hsr_add_port().

As a consequence of this change, hsr_for_each_port() is no
longer safe to work with hsr_del_port(), switch to
list_for_each_entry_safe() as we always hold RTNL lock.

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>

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 15c72065df79103fa78ee47db8f076a62529b055..f48b6a275cf0ea4e4c9e00a6d1a48bb3991850ef 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -351,13 +351,14 @@ static void hsr_dev_destroy(struct net_device *hsr_dev)
 {
        struct hsr_priv *hsr;
        struct hsr_port *port;
+       struct hsr_port *tmp;
 
        hsr = netdev_priv(hsr_dev);
 
        hsr_debugfs_term(hsr);
 
        rtnl_lock();
-       hsr_for_each_port(hsr, port)
+       list_for_each_entry_safe(port, tmp, &hsr->ports, port_list)
                hsr_del_port(port);
        rtnl_unlock();
 
@@ -428,6 +429,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
 {
        struct hsr_priv *hsr;
        struct hsr_port *port;
+       struct hsr_port *tmp;
        int res;
 
        hsr = netdev_priv(hsr_dev);
@@ -492,7 +494,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
        return 0;
 
 fail:
-       hsr_for_each_port(hsr, port)
+       list_for_each_entry_safe(port, tmp, &hsr->ports, port_list)
                hsr_del_port(port);
 err_add_port:
        hsr_del_node(&hsr->self_node_db);

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index 88b6705ded837165cd06544d98ea4fe513747f66..ee561297d8a760dfd6496ea34b63e3a14c9390c4 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -193,4 +193,5 @@ void hsr_del_port(struct hsr_port *port)
 
        if (port != master)
                dev_put(port->dev);
+       kfree(port);
 }