This is a note to let you know that I've just added the patch titled
devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
devlink-add-missing-genlmsg_cancel-in-devlink_nl_sb_port_pool_fill.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Nov 22 10:24:40 AM CET 2020
From: Wang Hai <wanghai38@xxxxxxxxxx>
Date: Fri, 13 Nov 2020 19:16:22 +0800
Subject: devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()
From: Wang Hai <wanghai38@xxxxxxxxxx>
[ 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@xxxxxxxxxx>
Signed-off-by: Wang Hai <wanghai38@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20201113111622.11040-1-wanghai38@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/core/devlink.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1311,7 +1311,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;
@@ -1324,8 +1324,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,
Patches currently in stable-queue which might be from wanghai38@xxxxxxxxxx are
queue-5.9/devlink-add-missing-genlmsg_cancel-in-devlink_nl_sb_port_pool_fill.patch
queue-5.9/inet_diag-fix-error-path-to-cancel-the-meseage-in-inet_req_diag_fill.patch
