2021-12-29 03:21:57

by Jiasheng Jiang

Subject: [PATCH] net/ncsi: check for error return from call to nla_put_u32

As we can see from the comment of the nla_put() that it could return
-EMSGSIZE if the tailroom of the skb is insufficient.
Therefore, it should be better to check the return value of the
nla_put_u32 and return the error code if error accurs.
Also, there are many other functions have the same problem, and if this
patch is correct, I will commit a new version to fix all.

Fixes: 955dc68cb9b2 ("net/ncsi: Add generic netlink family")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
net/ncsi/ncsi-netlink.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/ncsi/ncsi-netlink.c b/net/ncsi/ncsi-netlink.c
index bb5f1650f11c..c189b4c8a182 100644
--- a/net/ncsi/ncsi-netlink.c
+++ b/net/ncsi/ncsi-netlink.c
@@ -112,7 +112,11 @@ static int ncsi_write_package_info(struct sk_buff *skb,
pnest = nla_nest_start_noflag(skb, NCSI_PKG_ATTR);
if (!pnest)
return -ENOMEM;
- nla_put_u32(skb, NCSI_PKG_ATTR_ID, np->id);
+ rc = nla_put_u32(skb, NCSI_PKG_ATTR_ID, np->id);
+ if (rc) {
+ nla_nest_cancel(skb, pnest);
+ return rc;
+ }
if ((0x1 << np->id) == ndp->package_whitelist)
nla_put_flag(skb, NCSI_PKG_ATTR_FORCED);
cnest = nla_nest_start_noflag(skb, NCSI_PKG_ATTR_CHANNEL_LIST);
--
2.25.1

2021-12-30 02:30:15

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net/ncsi: check for error return from call to nla_put_u32

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Wed, 29 Dec 2021 11:21:18 +0800 you wrote:
> As we can see from the comment of the nla_put() that it could return
> -EMSGSIZE if the tailroom of the skb is insufficient.
> Therefore, it should be better to check the return value of the
> nla_put_u32 and return the error code if error accurs.
> Also, there are many other functions have the same problem, and if this
> patch is correct, I will commit a new version to fix all.
>
> [...]

Here is the summary with links:
- net/ncsi: check for error return from call to nla_put_u32
https://git.kernel.org/netdev/net/c/92a34ab169f9

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html