Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4578668pxv; Tue, 6 Jul 2021 04:31:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmZYesP3sWoJbomxLH6oWpR4rv9ILkM8+1rrG0mhOJ4RbbF8DzmOasOHOAtGcsRrL+qNcA X-Received: by 2002:a05:6402:220e:: with SMTP id cq14mr21776473edb.140.1625571079069; Tue, 06 Jul 2021 04:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571079; cv=none; d=google.com; s=arc-20160816; b=QcGl+zGn8oWL9TyysiTKE22NFLtsys05fzmhAKeIc1qCNFnAWHODPDYtJEduNgLEN7 AjQ13QYeagwzPpqH2GNUjg3sFXeDapgDTjLbk7+zmTo3VF+ioSgjYz3E76QsmjeVSRwh eM+T6SIGiDowpgwH/bl7aCmpmdN2L2qax+tHqqDJpGhnY1xroLE3nejUgLazLCW/V/89 CxqWd9gsIi4r/rbA4Vq2UAgXBhwQnu5UHMIFAbESZ8xL+ASfc2W18Q9HGzW0Z+PRESsr DJ3nqvnNTWJ5Yae2SlP/yU6j9Hrr71qjukCR5+JC53x4B6Etd2LQ0QaAYMjGPZ/h52Gd 86jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HRu50eeCRosa9S/ixRLwrci6CsJg8UaUU0gr6WnPbsM=; b=GGI4QMZy+AXTAg8r/jeXSamspl94uHa33bShAX38wli7Frv0fcua2HwqN9r34NovCf Jexo8QAwcvUZpCfM3hUUN7G6M9912Tx3K+Azkta7vlg/7vYPpbFhkkB05c4guptpyHek M2w8PDt/K8Laxe4hN3a+B2uricG6B4VH7MaAb+ambarJqMywUmc5exKxYBjeJQyLnHie p82bV/7K0nshYeTI6eT9yAUDmXAEU0aJkwi7W+XeLGpfeYHbBdAlinoPkH9dWdAQFycD kAmX5ZmdspdSjNir2R5hEef0GDgfYQTuYtqXF3tZy+biDA0oID0pBWn/PT+t+ZMYPXF5 01Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YZR4i4UU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nd1si14997874ejc.483.2021.07.06.04.30.54; Tue, 06 Jul 2021 04:31:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YZR4i4UU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235114AbhGFL3h (ORCPT + 99 others); Tue, 6 Jul 2021 07:29:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233025AbhGFLTy (ORCPT ); Tue, 6 Jul 2021 07:19:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B274461CBB; Tue, 6 Jul 2021 11:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570218; bh=fKUD4iN2+LvMxirRuESye6PTUzOC5Oed4ow7L8huVTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZR4i4UU28UA2HMnd8EOnI0Uh4ntp4dZBJMqMG3s8O5P19Wzya/M9RQAwsr1+t06J f2G8Wj+yzgwpWnCWHoRIwcB/XWVx406QffUA8u+K+xdRknXeQsoEZe8E84I3VBFW3d 7K4/LPcFXmdqSR+NpK0MMBYpBEi9o6ww4t2WaWJLi7qtzEjbiOOKE9fEoS+LYLc9Cs zqWvHmcEbxR1/2GYB76XhbahBVg4r8AMrNUNbcBANq4lJOxrRmVvnedQIUGlr0H3xQ TxbdP9RqgV7Q1mo462iYozIUchAjcnK3xqSOITMOxFFLtHuVwEmejB/LGmiSFQ0SSl BRa2zRjdT6mug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 126/189] net: sched: fix error return code in tcf_del_walker() Date: Tue, 6 Jul 2021 07:13:06 -0400 Message-Id: <20210706111409.2058071-126-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ 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 Signed-off-by: Yang Yingliang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sched/act_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sched/act_api.c b/net/sched/act_api.c index f6d5755d669e..d17a66aab8ee 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -381,7 +381,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); -- 2.30.2