Commit c7983044 authored by Tomas Henzl's avatar Tomas Henzl Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Fix memory leaks in mpi3mr_init_ioc() 



Don't allocate memory again when IOC is being reinitialized.

Fixes: fe6db615 ("scsi: mpi3mr: Handle offline FW activation in graceful manner")
Signed-off-by: default avatarTomas Henzl <thenzl@redhat.com>
Link: https://lore.kernel.org/r/20230302234336.25456-6-thenzl@redhat.com


Acked-by: default avatarSathya Prakash Veerichetty <sathya.prakash@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d4caa1a4

drivers/scsi/mpi3mr/mpi3mr_fw.c

+23 −18
Original line number Diff line number Diff line
@@ -3837,16 +3837,18 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 


	mpi3mr_print_ioc_info(mrioc);



	if (!mrioc->cfg_page) {

		dprint_init(mrioc, "allocating config page buffers\n");

		mrioc->cfg_page_sz = MPI3MR_DEFAULT_CFG_PAGE_SZ;

		mrioc->cfg_page = dma_alloc_coherent(&mrioc->pdev->dev,

	    MPI3MR_DEFAULT_CFG_PAGE_SZ, &mrioc->cfg_page_dma, GFP_KERNEL);

		    mrioc->cfg_page_sz, &mrioc->cfg_page_dma, GFP_KERNEL);

		if (!mrioc->cfg_page) {

			retval = -1;

			goto out_failed_noretry;

		}

	}



	mrioc->cfg_page_sz = MPI3MR_DEFAULT_CFG_PAGE_SZ;



	if (!mrioc->init_cmds.reply) {

		retval = mpi3mr_alloc_reply_sense_bufs(mrioc);

		if (retval) {

			ioc_err(mrioc,
@@ -3854,13 +3856,16 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) 
			    __func__, retval);

			goto out_failed_noretry;

		}

	}



	if (!mrioc->chain_sgl_list) {

		retval = mpi3mr_alloc_chain_bufs(mrioc);

		if (retval) {

			ioc_err(mrioc, "Failed to allocated chain buffers %d\n",

			    retval);

			goto out_failed_noretry;

		}

	}



	retval = mpi3mr_issue_iocinit(mrioc);

	if (retval) {