Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 619afef0 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 114b5b35

net/hsr/hsr_device.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

net/hsr/hsr_slave.c

+1 −0
Original line number Diff line number Diff line
@@ -193,4 +193,5 @@ void hsr_del_port(struct hsr_port *port) 


	if (port != master)

		dev_put(port->dev);

	kfree(port);

}