diff options
| author | Jia-Ju Bai <baijiaju1990@gmail.com> | 2021-03-07 01:12:56 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-30 14:36:58 +0200 |
| commit | 04dca3c979865cd990f0b883803a7303f08ed2d3 (patch) | |
| tree | 4f38aab1899bfc65b11dec74869bb07060c51177 /drivers/net/wan | |
| parent | 46cd49a1f0c47c62f01b97a5d7eb7223e5a6ee59 (diff) | |
| download | linux-stable-04dca3c979865cd990f0b883803a7303f08ed2d3.tar.gz linux-stable-04dca3c979865cd990f0b883803a7303f08ed2d3.tar.bz2 linux-stable-04dca3c979865cd990f0b883803a7303f08ed2d3.zip | |
net: wan: fix error return code of uhdlc_init()
[ 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 <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/fsl_ucc_hdlc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 9ab04ef532f3..5df6e85e7ccb 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -201,14 +201,18 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) priv->rx_skbuff = kcalloc(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 = kcalloc(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; |