lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 052/124] scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
    Date
    From: Javed Hasan <jhasan@marvell.com>

    [ Upstream commit ec007ef40abb6a164d148b0dc19789a7a2de2cc8 ]

    In fc_disc_gpn_id_resp(), skb is supposed to get freed in all cases except
    for PTR_ERR. However, in some cases it didn't.

    This fix is to call fc_frame_free(fp) before function returns.

    Link: https://lore.kernel.org/r/20200729081824.30996-2-jhasan@marvell.com
    Reviewed-by: Girish Basrur <gbasrur@marvell.com>
    Reviewed-by: Santosh Vernekar <svernekar@marvell.com>
    Reviewed-by: Saurav Kashyap <skashyap@marvell.com>
    Reviewed-by: Shyam Sundar <ssundar@marvell.com>
    Signed-off-by: Javed Hasan <jhasan@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/libfc/fc_disc.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
    index 2b865c6423e29..e00dc4693fcbd 100644
    --- a/drivers/scsi/libfc/fc_disc.c
    +++ b/drivers/scsi/libfc/fc_disc.c
    @@ -581,8 +581,12 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp,

    if (PTR_ERR(fp) == -FC_EX_CLOSED)
    goto out;
    - if (IS_ERR(fp))
    - goto redisc;
    + if (IS_ERR(fp)) {
    + mutex_lock(&disc->disc_mutex);
    + fc_disc_restart(disc);
    + mutex_unlock(&disc->disc_mutex);
    + goto out;
    + }

    cp = fc_frame_payload_get(fp, sizeof(*cp));
    if (!cp)
    @@ -609,7 +613,7 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp,
    new_rdata->disc_id = disc->disc_id;
    fc_rport_login(new_rdata);
    }
    - goto out;
    + goto free_fp;
    }
    rdata->disc_id = disc->disc_id;
    mutex_unlock(&rdata->rp_mutex);
    @@ -626,6 +630,8 @@ redisc:
    fc_disc_restart(disc);
    mutex_unlock(&disc->disc_mutex);
    }
    +free_fp:
    + fc_frame_free(fp);
    out:
    kref_put(&rdata->kref, fc_rport_destroy);
    if (!IS_ERR(fp))
    --
    2.25.1


    \
     
     \ /
      Last update: 2022-09-17 16:08    [W:4.400 / U:0.780 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site