From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22183C433DF for ; Thu, 20 Aug 2020 00:05:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5C3E207FB for ; Thu, 20 Aug 2020 00:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597881931; bh=8vKLAkZ6WxQt+UZuDbu0chFB9hMbtXM+qxhcHfoNxr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=132v/4Ilvp3OyRrcmkiOvHspUBz186Nk++EWvMwiIcgbckzZaIz0dfiD4ljs6G7Sf tf3SEBWpy4q0O4rJkpx16s7MteQjEWaW14lJX1Y9Rg84iszeX7PCcPhhoj1B3Rdnc1 bx6YzCDKOZWop2PbjQoXZhZ0V28FTO/S/kuOI5nE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728401AbgHTAED (ORCPT ); Wed, 19 Aug 2020 20:04:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:33582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726841AbgHTADn (ORCPT ); Wed, 19 Aug 2020 20:03:43 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C584921741; Thu, 20 Aug 2020 00:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597881823; bh=8vKLAkZ6WxQt+UZuDbu0chFB9hMbtXM+qxhcHfoNxr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=noPVAgm2EFL1zk2JP0Lz+d5x4rTXa/W5f/CafaaqRhfJuQ9OO3M+3DZ7GtAaAHhJX SCHMHvHbhpTOvtICXd9qfpQHUhx9y6t34yb0UgzN1Um9XYhXrkjnEQJPbnuR5yPc3F RkTS7dPTWfpbc+H4DRwDUxs4M7w09VAlnEmS0/5U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Javed Hasan , Girish Basrur , Santosh Vernekar , Saurav Kashyap , Shyam Sundar , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 10/13] scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases Date: Wed, 19 Aug 2020 20:03:25 -0400 Message-Id: <20200820000328.215755-10-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200820000328.215755-1-sashal@kernel.org> References: <20200820000328.215755-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Javed Hasan [ 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 Reviewed-by: Santosh Vernekar Reviewed-by: Saurav Kashyap Reviewed-by: Shyam Sundar Signed-off-by: Javed Hasan Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- 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 28b50ab2fbb01..62f83cc151b22 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c @@ -605,8 +605,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) @@ -633,7 +637,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); @@ -650,6 +654,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