lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 073/477] scsi: cxgb3i: Fix some leaks in init_act_open()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit b6170a49c59c27a10efed26c5a2969403e69aaba ]

    There wasn't any clean up done if cxgb3_alloc_atid() failed and also the
    original code didn't release "csk->l2t".

    Link: https://lore.kernel.org/r/20200521121221.GA247492@mwanda
    Fixes: 6f7efaabefeb ("[SCSI] cxgb3i: change cxgb3i to use libcxgbi")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 18 ++++++++++++++----
    1 file changed, 14 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
    index 524cdbcd29aa4..ec7d01f6e2d58 100644
    --- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
    +++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
    @@ -959,6 +959,7 @@ static int init_act_open(struct cxgbi_sock *csk)
    struct net_device *ndev = cdev->ports[csk->port_id];
    struct cxgbi_hba *chba = cdev->hbas[csk->port_id];
    struct sk_buff *skb = NULL;
    + int ret;

    log_debug(1 << CXGBI_DBG_TOE | 1 << CXGBI_DBG_SOCK,
    "csk 0x%p,%u,0x%lx.\n", csk, csk->state, csk->flags);
    @@ -979,16 +980,16 @@ static int init_act_open(struct cxgbi_sock *csk)
    csk->atid = cxgb3_alloc_atid(t3dev, &t3_client, csk);
    if (csk->atid < 0) {
    pr_err("NO atid available.\n");
    - return -EINVAL;
    + ret = -EINVAL;
    + goto put_sock;
    }
    cxgbi_sock_set_flag(csk, CTPF_HAS_ATID);
    cxgbi_sock_get(csk);

    skb = alloc_wr(sizeof(struct cpl_act_open_req), 0, GFP_KERNEL);
    if (!skb) {
    - cxgb3_free_atid(t3dev, csk->atid);
    - cxgbi_sock_put(csk);
    - return -ENOMEM;
    + ret = -ENOMEM;
    + goto free_atid;
    }
    skb->sk = (struct sock *)csk;
    set_arp_failure_handler(skb, act_open_arp_failure);
    @@ -1010,6 +1011,15 @@ static int init_act_open(struct cxgbi_sock *csk)
    cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN);
    send_act_open_req(csk, skb, csk->l2t);
    return 0;
    +
    +free_atid:
    + cxgb3_free_atid(t3dev, csk->atid);
    +put_sock:
    + cxgbi_sock_put(csk);
    + l2t_release(t3dev, csk->l2t);
    + csk->l2t = NULL;
    +
    + return ret;
    }

    cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS] = {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:06    [W:4.142 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site