From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 417AC2566 for ; Tue, 18 Apr 2023 12:34:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8133C433D2; Tue, 18 Apr 2023 12:34:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681821296; bh=ol+lBlJkR7zdGSJo0GNax1VF07ZK1pzRC7x/a4MvU68=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uFF+KFMH/PybPfCJWCK2VthXjWIr1ocDVOPPRg6KLnxbkBfks4l8uCzDBlF0xqZ8E WdITkVqjRzowtcaJ+Ui1OqnUsNguA9z8PYWPUC2rnDq5ojKPV6ZfDZrvtw4fxcXYX/ pTsymxhbOb8CyEIr9HPqsvnxDla4bXYGYEViRIxE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Harshit Mogalapalli , Simon Horman , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 073/124] niu: Fix missing unwind goto in niu_alloc_channels() Date: Tue, 18 Apr 2023 14:21:32 +0200 Message-Id: <20230418120312.504117959@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230418120309.539243408@linuxfoundation.org> References: <20230418120309.539243408@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Harshit Mogalapalli [ Upstream commit 8ce07be703456acb00e83d99f3b8036252c33b02 ] Smatch reports: drivers/net/ethernet/sun/niu.c:4525 niu_alloc_channels() warn: missing unwind goto? If niu_rbr_fill() fails, then we are directly returning 'err' without freeing the channels. Fix this by changing direct return to a goto 'out_err'. Fixes: a3138df9f20e ("[NIU]: Add Sun Neptune ethernet driver.") Signed-off-by: Harshit Mogalapalli Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/sun/niu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 860644d182ab0..1a269fa8c1a07 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -4503,7 +4503,7 @@ static int niu_alloc_channels(struct niu *np) err = niu_rbr_fill(np, rp, GFP_KERNEL); if (err) - return err; + goto out_err; } tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info), -- 2.39.2