Message ID | 20201113111622.11040-1-wanghai38@huawei.com |
---|---|
State | Superseded |
Headers | show |
Series | [v2,net] devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill() | expand |
On Fri, 13 Nov 2020 19:16:22 +0800 Wang Hai wrote: > 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> Applied, thanks!
diff --git a/net/core/devlink.c b/net/core/devlink.c index a932d95be798..be8ee96ad188 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -1448,7 +1448,7 @@ static int devlink_nl_sb_port_pool_fill(struct sk_buff *msg, 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; @@ -1461,8 +1461,10 @@ static int devlink_nl_sb_port_pool_fill(struct sk_buff *msg, 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,
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> --- v1->v2: use goto instead of direct return net/core/devlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)