Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e42fafc2 authored by nagalakshmi.nandigama@lsi.com's avatar nagalakshmi.nandigama@lsi.com Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Fix for panic happening because of improper memory allocation 



The ioc->pfacts member in the IOC structure is getting set to zero
following a call to _base_get_ioc_facts due to the memset in that routine.
So if the ioc->pfacts was read after a host reset, there would be a NULL
pointer dereference. The routine _base_get_ioc_facts is called from context
of host reset.  The problem in _base_get_ioc_facts  is the size of
Mpi2IOCFactsReply is 64, whereas the sizeof "struct mpt2sas_facts" is 60,
so there is a four byte overflow resulting from the memset.

Also, there is memset in _base_get_port_facts using the incorrect structure,
it should be "struct mpt2sas_port_facts" instead of Mpi2PortFactsReply.

Signed-off-by: default avatarNagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 39af7a98

drivers/scsi/mpt2sas/mpt2sas_base.c

+3 −3
Original line number Diff line number Diff line
@@ -3350,7 +3350,7 @@ _base_get_port_facts(struct MPT2SAS_ADAPTER *ioc, int port, int sleep_flag) 
	}



	pfacts = &ioc->pfacts[port];

	memset(pfacts, 0, sizeof(Mpi2PortFactsReply_t));

	memset(pfacts, 0, sizeof(struct mpt2sas_port_facts));

	pfacts->PortNumber = mpi_reply.PortNumber;

	pfacts->VP_ID = mpi_reply.VP_ID;

	pfacts->VF_ID = mpi_reply.VF_ID;
@@ -3392,7 +3392,7 @@ _base_get_ioc_facts(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) 
	}



	facts = &ioc->facts;

	memset(facts, 0, sizeof(Mpi2IOCFactsReply_t));

	memset(facts, 0, sizeof(struct mpt2sas_facts));

	facts->MsgVersion = le16_to_cpu(mpi_reply.MsgVersion);

	facts->HeaderVersion = le16_to_cpu(mpi_reply.HeaderVersion);

	facts->VP_ID = mpi_reply.VP_ID;
@@ -4270,7 +4270,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) 
		goto out_free_resources;



	ioc->pfacts = kcalloc(ioc->facts.NumberOfPorts,

	    sizeof(Mpi2PortFactsReply_t), GFP_KERNEL);

	    sizeof(struct mpt2sas_port_facts), GFP_KERNEL);

	if (!ioc->pfacts) {

		r = -ENOMEM;

		goto out_free_resources;