lkml.org 
[lkml]   [2018]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 17/79] net: propagate dev_get_valid_name return code
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Li RongQing <lirongqing@baidu.com>

    [ Upstream commit 7892bd081045222b9e4027fec279a28d6fe7aa66 ]

    if dev_get_valid_name failed, propagate its return code

    and remove the setting err to ENODEV, it will be set to
    0 again before dev_change_net_namespace exits.

    Signed-off-by: Li RongQing <lirongqing@baidu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/core/dev.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -7420,7 +7420,8 @@ int dev_change_net_namespace(struct net_
    /* We get here if we can't use the current device name */
    if (!pat)
    goto out;
    - if (dev_get_valid_name(net, dev, pat) < 0)
    + err = dev_get_valid_name(net, dev, pat);
    + if (err < 0)
    goto out;
    }

    @@ -7432,7 +7433,6 @@ int dev_change_net_namespace(struct net_
    dev_close(dev);

    /* And unlink it from device chain */
    - err = -ENODEV;
    unlist_netdevice(dev);

    synchronize_net();

    \
     
     \ /
      Last update: 2018-08-23 09:59    [W:4.310 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site