From patchwork Mon Sep 21 16:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309408 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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 100A4C43469 for ; Mon, 21 Sep 2020 16:48:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC3D723888 for ; Mon, 21 Sep 2020 16:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706906; bh=x6pybX7Gh2+xviWV8swtUoFvUIcZtEg7U5z2BDWGXLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UbfyJVRRzhJSa5CFfoDgFiOqNxgFs5FEv8R6EB4XinnwsGhTthXXp8uIYxAkHJSDR wqSZ+jWASl44CXNs4lgoEpaU9dgCTpzvIUqpmobrPRSwggrtLKWLiWssKGk22v5KWv lJlCi8Q7tW/1qA1lMMwvWRn8cShpCsFSueOcibdk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729833AbgIUQs0 (ORCPT ); Mon, 21 Sep 2020 12:48:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:55004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729080AbgIUQrx (ORCPT ); Mon, 21 Sep 2020 12:47:53 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8DAF820874; Mon, 21 Sep 2020 16:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706873; bh=x6pybX7Gh2+xviWV8swtUoFvUIcZtEg7U5z2BDWGXLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bhpbi/B722uwHnoMKfdzYYX99FabUbtgKQefsku1fO28538XOSrTOSfkMItzGGKh+ U+N3IweyacQ9+S6shq7IJM07UcLzp0k8dhWt+IcbwNTczirQMhdVgNNtOnXyxd35yw Mv6dBzI4zNBky5O5RsrIeQTgNJ4K0UKwX5A20LOc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Javed Hasan , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.4 10/72] scsi: libfc: Fix for double free() Date: Mon, 21 Sep 2020 18:30:49 +0200 Message-Id: <20200921163122.370307029@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921163121.870386357@linuxfoundation.org> References: <20200921163121.870386357@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Javed Hasan [ Upstream commit 5a5b80f98534416b3b253859897e2ba1dc241e70 ] Fix for '&fp->skb' double free. Link: https://lore.kernel.org/r/20200825093940.19612-1-jhasan@marvell.com Reported-by: Dan Carpenter Signed-off-by: Javed Hasan Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/libfc/fc_disc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index e00dc4693fcbd..589ddf003886e 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c @@ -634,8 +634,6 @@ free_fp: fc_frame_free(fp); out: kref_put(&rdata->kref, fc_rport_destroy); - if (!IS_ERR(fp)) - fc_frame_free(fp); } /**