lkml.org 
[lkml]   [2018]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 23/81] Revert "macsec: missing dev_put() on error in macsec_newlink()"
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>


    [ Upstream commit bd28899dd34f9283c567f7eeb31bb546f10820b5 ]

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

    Reported-by: Laura Abbott <labbott@redhat.com>
    Fixes: 5dcd8400884c ("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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/macsec.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    --- a/drivers/net/macsec.c
    +++ b/drivers/net/macsec.c
    @@ -3277,7 +3277,7 @@ static int macsec_newlink(struct net *ne

    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 @@ del_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;
    }

    \
     
     \ /
      Last update: 2018-04-27 16:34    [W:3.568 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site