linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Javed Hasan <jhasan@marvell.com>,
	Girish Basrur <gbasrur@marvell.com>,
	Santosh Vernekar <svernekar@marvell.com>,
	Saurav Kashyap <skashyap@marvell.com>,
	Shyam Sundar <ssundar@marvell.com>,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	Sasha Levin <sashal@kernel.org>,
	linux-scsi@vger.kernel.org
Subject: [PATCH AUTOSEL 5.8 20/27] scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
Date: Wed, 19 Aug 2020 20:01:09 -0400	[thread overview]
Message-ID: <20200820000116.214821-20-sashal@kernel.org> (raw)
In-Reply-To: <20200820000116.214821-1-sashal@kernel.org>

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 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp,
 		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


  parent reply	other threads:[~2020-08-20  0:12 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-20  0:00 [PATCH AUTOSEL 5.8 01/27] scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 02/27] scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 03/27] media: budget-core: Improve exception handling in budget_register() Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 04/27] media: coda: jpeg: add NULL check after kmalloc Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 05/27] f2fs: fix to check page dirty status before writeback Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 06/27] rtc: goldfish: Enable interrupt in set_alarm() when necessary Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 07/27] media: vpss: clean up resources in init Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 08/27] f2fs: should avoid inode eviction in synchronous path Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 09/27] Input: psmouse - add a newline when printing 'proto' by sysfs Sasha Levin
2020-08-20  0:00 ` [PATCH AUTOSEL 5.8 10/27] MIPS: Fix unable to reserve memory for Crash kernel Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 11/27] m68knommu: fix overwriting of bits in ColdFire V3 cache control Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 12/27] svcrdma: Fix another Receive buffer leak Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 13/27] xfs: fix inode quota reservation checks Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 14/27] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 15/27] riscv: Fixup static_obj() fail Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 16/27] jffs2: fix UAF problem Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 17/27] ceph: fix use-after-free for fsc->mdsc Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 18/27] swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 19/27] cpufreq: intel_pstate: Fix cpuinfo_max_freq when MSR_TURBO_RATIO_LIMIT is 0 Sasha Levin
2020-08-20  0:01 ` Sasha Levin [this message]
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 21/27] virtio_ring: Avoid loop when vq is broken in virtqueue_poll Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 22/27] media: camss: fix memory leaks on error handling paths in probe Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 23/27] tools/testing/selftests/cgroup/cgroup_util.c: cg_read_strcmp: fix null pointer dereference Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 24/27] xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 25/27] alpha: fix annotation of io{read,write}{16,32}be() Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 26/27] fat: fix fat_ra_init() for data clusters == 0 Sasha Levin
2020-08-20  0:01 ` [PATCH AUTOSEL 5.8 27/27] fs/signalfd.c: fix inconsistent return codes for signalfd4 Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200820000116.214821-20-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=gbasrur@marvell.com \
    --cc=jhasan@marvell.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=skashyap@marvell.com \
    --cc=ssundar@marvell.com \
    --cc=stable@vger.kernel.org \
    --cc=svernekar@marvell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).