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

Commit 20acebdf authored by Brian W Hart's avatar Brian W Hart Committed by Benjamin Herrenschmidt
Browse files

powernv/eeh: Fix possible buffer overrun in ioda_eeh_phb_diag() 



PHB diagnostic buffer may be smaller than PAGE_SIZE, especially when
PAGE_SIZE > 4KB.

Signed-off-by: default avatarBrian W Hart <hartb@linux.vnet.ibm.com>
Acked-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 20151169

arch/powerpc/platforms/powernv/eeh-ioda.c

+3 −2
Original line number Diff line number Diff line
@@ -820,14 +820,15 @@ static void ioda_eeh_phb_diag(struct pci_controller *hose) 
	struct OpalIoPhbErrorCommon *common;

	long rc;



	common = (struct OpalIoPhbErrorCommon *)phb->diag.blob;

	rc = opal_pci_get_phb_diag_data2(phb->opal_id, common, PAGE_SIZE);

	rc = opal_pci_get_phb_diag_data2(phb->opal_id, phb->diag.blob,

					 PNV_PCI_DIAG_BUF_SIZE);

	if (rc != OPAL_SUCCESS) {

		pr_warning("%s: Failed to get diag-data for PHB#%x (%ld)\n",

			    __func__, hose->global_number, rc);

		return;

	}



	common = (struct OpalIoPhbErrorCommon *)phb->diag.blob;

	switch (common->ioType) {

	case OPAL_PHB_ERROR_DATA_TYPE_P7IOC:

		ioda_eeh_p7ioc_phb_diag(hose, common);