diff options
| author | Taehee Yoo <ap420073@gmail.com> | 2020-03-05 00:02:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-05 11:59:47 -0800 |
| commit | 56dc0a0eac999b77b1d37fe83a3c0409a6066319 (patch) | |
| tree | f5d5eb1a59dab6890d0f247b99348e1fd577a877 /net/hsr | |
| parent | d99045283ec1ff4d2f65336e2ba81b49970fd5ab (diff) | |
| download | linux-stable-56dc0a0eac999b77b1d37fe83a3c0409a6066319.tar.gz linux-stable-56dc0a0eac999b77b1d37fe83a3c0409a6066319.tar.bz2 linux-stable-56dc0a0eac999b77b1d37fe83a3c0409a6066319.zip | |
hsr: fix refcnt leak of hsr slave interface
In the commit e0a4b99773d3 ("hsr: use upper/lower device infrastructure"),
dev_get() was removed but dev_put() in the error path wasn't removed.
So, if creating hsr interface command is failed, the reference counter leak
of lower interface would occur.
Test commands:
ip link add dummy0 type dummy
ip link add ipvlan0 link dummy0 type ipvlan mode l2
ip link add ipvlan1 link dummy0 type ipvlan mode l2
ip link add hsr0 type hsr slave1 ipvlan0 slave2 ipvlan1
ip link del ipvlan0
Result:
[ 633.271992][ T1280] unregister_netdevice: waiting for ipvlan0 to become free. Usage count = -1
Fixes: e0a4b99773d3 ("hsr: use upper/lower device infrastructure")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_slave.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c index 123605cb5420..d3547e8c6d5b 100644 --- a/net/hsr/hsr_slave.c +++ b/net/hsr/hsr_slave.c @@ -108,7 +108,7 @@ static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev, res = dev_set_promiscuity(dev, 1); if (res) - goto fail_promiscuity; + return res; master = hsr_port_get_hsr(hsr, HSR_PT_MASTER); hsr_dev = master->dev; @@ -128,9 +128,6 @@ fail_rx_handler: netdev_upper_dev_unlink(dev, hsr_dev); fail_upper_dev_link: dev_set_promiscuity(dev, -1); -fail_promiscuity: - dev_put(dev); - return res; } |