From: Yang Yingliang <yangyingliang@huawei.com>
Date: Thu, 17 Jun 2021 08:02:07 +0000 (+0800)
Subject: net: sched: fix error return code in tcf_del_walker()
X-Git-Tag: v5.4.133~74
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=995c3fc302bd922b93fb205fb830875ddb955a18;p=users%2Fdwmw2%2Flinux.git

net: sched: fix error return code in tcf_del_walker()

[ Upstream commit 55d96f72e8ddc0a294e0b9c94016edbb699537e1 ]

When nla_put_u32() fails, 'ret' could be 0, it should
return error code in tcf_del_walker().

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 716cad6773184..17e5cd9ebd89f 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -316,7 +316,8 @@ static int tcf_del_walker(struct tcf_idrinfo *idrinfo, struct sk_buff *skb,
 	}
 	mutex_unlock(&idrinfo->lock);
 
-	if (nla_put_u32(skb, TCA_FCNT, n_i))
+	ret = nla_put_u32(skb, TCA_FCNT, n_i);
+	if (ret)
 		goto nla_put_failure;
 	nla_nest_end(skb, nest);