lkml.org 
[lkml]   [2021]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] net: wan: fix error return code of uhdlc_init()
    Date
    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>
    ---
    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 dca97cd7c4e7..7eac6a3e1cde 100644
    --- a/drivers/net/wan/fsl_ucc_hdlc.c
    +++ b/drivers/net/wan/fsl_ucc_hdlc.c
    @@ -204,14 +204,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;
    --
    2.17.1
    \
     
     \ /
      Last update: 2022-09-17 16:09    [W:4.280 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site