Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dc95e93 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

net/ncsi: check for error return from call to nla_put_u32 



[ Upstream commit 92a34ab169f9eefe29cd420ce96b0a0a2a1da853 ]

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: 955dc68c ("net/ncsi: Add generic netlink family")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Link: https://lore.kernel.org/r/20211229032118.1706294-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ef01d631

net/ncsi/ncsi-netlink.c

+5 −1
Original line number Diff line number Diff line
@@ -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);