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

Commit bd28899d authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

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



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 5dcd8400.

Reported-by: default avatarLaura Abbott <labbott@redhat.com>
Fixes: 5dcd8400 ("macsec: missing dev_put() on error in macsec_newlink()")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c246fd33

drivers/net/macsec.c

+2 −3
Original line number Diff line number Diff line
@@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev, 


	err = netdev_upper_dev_link(real_dev, dev, extack);

	if (err < 0)

		goto put_dev;

		goto unregister;



	/* need to be already registered so that ->init has run and

	 * the MAC addr is set
@@ -3316,8 +3316,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev, 
	macsec_del_dev(macsec);

unlink:

	netdev_upper_dev_unlink(real_dev, dev);

put_dev:

	dev_put(real_dev);

unregister:

	unregister_netdevice(dev);

	return err;

}