From: Javed Hasan <jhasan@marvell.com>
Date: Tue, 25 Aug 2020 02:39:40 -0700
Subject: scsi: libfc: Fix for double free()
Patch-mainline: v5.9 or v5.9-rc5 (next release)
Git-commit: 5a5b80f98534416b3b253859897e2ba1dc241e70
References: bsc#1174899

Fix for '&fp->skb' double free.

Link:
https://lore.kernel.org/r/20200825093940.19612-1-jhasan@marvell.com
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Javed Hasan <jhasan@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Daniel Wagner <dwagner@suse.de>
---
 drivers/scsi/libfc/fc_disc.c |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -646,8 +646,6 @@ static void fc_disc_gpn_id_resp(struct f
 	fc_frame_free(fp);
 out:
 	kref_put(&rdata->kref, fc_rport_destroy);
-	if (!IS_ERR(fp))
-		fc_frame_free(fp);
 }
 
 /**