6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pedro Tammela pctammela@mojatatu.com
commit fb07390463c95e6eef254044d6dde050bfb9807a upstream.
Smatch reports that 'ci' can be used uninitialized. The current code ignores errno coming from tcf_idr_check_alloc, which will lead to the incorrect usage of 'ci'. Handle the errno as it should.
Fixes: 288864effe33 ("net/sched: act_connmark: transition to percpu stats and rcu") Reviewed-by: Jamal Hadi Salim jhs@mojatatu.com Signed-off-by: Pedro Tammela pctammela@mojatatu.com Reviewed-by: Simon Horman simon.horman@corigine.com Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- net/sched/act_connmark.c | 3 +++ 1 file changed, 3 insertions(+)
--- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -156,6 +156,9 @@ static int tcf_connmark_init(struct net nparms->zone = parm->zone;
ret = 0; + } else { + err = ret; + goto out_free; }
err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack);