leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "macsec: missing dev_put() on error in macsec_newlink()"

Browse Source 
This patch is just wrong, sorry.  I was trying to fix a static checker
warning and misread the code.  The reference taken in macsec_newlink()
is released in macsec_free_netdev() when the netdevice is destroyed.

This reverts commit 5dcd840088.

Reported-by: Laura Abbott <labbott@redhat.com>
Fixes: 5dcd840088 ("macsec: missing dev_put() on error in macsec_newlink()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dan Carpenter 2018-04-16 13:17:50 +03:00 committed by David S. Miller
parent c246fd333f
commit bd28899dd3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/macsec.c
View File

@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
err = netdev_upper_dev_link(real_dev, dev, extack); err = netdev_upper_dev_link(real_dev, dev, extack);
if (err < 0) if (err < 0)
goto put_dev; goto unregister;
/* need to be already registered so that ->init has run and /* need to be already registered so that ->init has run and
* the MAC addr is set * the MAC addr is set
@ -3316,8 +3316,7 @@ del_dev:
macsec_del_dev(macsec); macsec_del_dev(macsec);
unlink: unlink:
netdev_upper_dev_unlink(real_dev, dev); netdev_upper_dev_unlink(real_dev, dev);
put_dev: unregister:
dev_put(real_dev);
unregister_netdevice(dev); unregister_netdevice(dev);
return err; return err;
} }