lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 04/91] devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()
    Date
    From: Wang Hai <wanghai38@huawei.com>

    [ Upstream commit 849920c703392957f94023f77ec89ca6cf119d43 ]

    If sb_occ_port_pool_get() failed in devlink_nl_sb_port_pool_fill(),
    msg should be canceled by genlmsg_cancel().

    Fixes: df38dafd2559 ("devlink: implement shared buffer occupancy monitoring interface")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Wang Hai <wanghai38@huawei.com>
    Link: https://lore.kernel.org/r/20201113111622.11040-1-wanghai38@huawei.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/core/devlink.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/net/core/devlink.c
    +++ b/net/core/devlink.c
    @@ -1113,7 +1113,7 @@ static int devlink_nl_sb_port_pool_fill(
    err = ops->sb_occ_port_pool_get(devlink_port, devlink_sb->index,
    pool_index, &cur, &max);
    if (err && err != -EOPNOTSUPP)
    - return err;
    + goto sb_occ_get_failure;
    if (!err) {
    if (nla_put_u32(msg, DEVLINK_ATTR_SB_OCC_CUR, cur))
    goto nla_put_failure;
    @@ -1126,8 +1126,10 @@ static int devlink_nl_sb_port_pool_fill(
    return 0;

    nla_put_failure:
    + err = -EMSGSIZE;
    +sb_occ_get_failure:
    genlmsg_cancel(msg, hdr);
    - return -EMSGSIZE;
    + return err;
    }

    static int devlink_nl_cmd_sb_port_pool_get_doit(struct sk_buff *skb,

    \
     
     \ /
      Last update: 2020-11-23 14:41    [W:4.043 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site