From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A3DBC433E0 for ; Wed, 17 Mar 2021 01:05:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C41564F92 for ; Wed, 17 Mar 2021 01:05:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232239AbhCQBFZ (ORCPT ); Tue, 16 Mar 2021 21:05:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:40716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230475AbhCQA7h (ORCPT ); Tue, 16 Mar 2021 20:59:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7980964F94; Wed, 17 Mar 2021 00:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615942777; bh=rVIQyEFnbYpmwe2tL+21fMnvaa1ETVEjQcbRrNQkT+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=On5gsGQQw7jg21x4SNmi5G4Zzwzc0lC32VEAKkVvxRcWZnNSK8Sx2Y6T0ikPBNGO6 6rLzCJ9LoveWVRbqfdw91OpsBVT6lLn7/vt43fsHdypAI8vvcY1AVT9sbiPRTYttX7 MmJA7+OcXbdoka+o7O1jUPCNeY4D0RLgx9aMG6wBVnbW4S4FR7laHyJVpkP4FzJWBA rhXS6PA98prhzkTIDvhqNhwa/Rvd6waATuArYiW0UevVhD6CQR9XfJo2GWY787k9/l KEHlcue5KjBmqSBXMNg4mOyvrbHJT6Fgni8+CgGw1lpK4qDk2PYZ43lksqF0Xja1Jl ZPQY6DkcGxqvA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jia-Ju Bai , TOTE Robot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.14 13/21] net: wan: fix error return code of uhdlc_init() Date: Tue, 16 Mar 2021 20:59:12 -0400 Message-Id: <20210317005920.726931-13-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210317005920.726931-1-sashal@kernel.org> References: <20210317005920.726931-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: Jia-Ju Bai [ Upstream commit 62765d39553cfd1ad340124fe1e280450e8c89e2 ] When priv->rx_skbuff or priv->tx_skbuff is NULL, no error return code of uhdlc_init() is assigned. To fix this bug, ret is assigned with -ENOMEM in these cases. Reported-by: TOTE Robot Signed-off-by: Jia-Ju Bai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/wan/fsl_ucc_hdlc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 6a26cef62193..978f642daced 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -200,13 +200,17 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) priv->rx_skbuff = kzalloc(priv->rx_ring_size * sizeof(*priv->rx_skbuff), GFP_KERNEL); - if (!priv->rx_skbuff) + if (!priv->rx_skbuff) { + ret = -ENOMEM; goto free_ucc_pram; + } priv->tx_skbuff = kzalloc(priv->tx_ring_size * sizeof(*priv->tx_skbuff), GFP_KERNEL); - if (!priv->tx_skbuff) + if (!priv->tx_skbuff) { + ret = -ENOMEM; goto free_rx_skbuff; + } priv->skb_curtx = 0; priv->skb_dirtytx = 0; -- 2.30.1