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

Commit 75f029c3 authored by Arvind Yadav's avatar Arvind Yadav Committed by Borislav Petkov
Browse files

EDAC: Handle return value of kasprintf() 



kasprintf() can fail and we must check its return value.

Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Cc: linux-edac@vger.kernel.org
[ Merged into a single patch, small formatting fixups. ]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 2bd6bf03

drivers/edac/i7core_edac.c

+9 −2
Original line number Diff line number Diff line
@@ -2159,8 +2159,13 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev) 
	mci->edac_ctl_cap = EDAC_FLAG_NONE;

	mci->edac_cap = EDAC_FLAG_NONE;

	mci->mod_name = "i7core_edac.c";

	mci->ctl_name = kasprintf(GFP_KERNEL, "i7 core #%d",

				  i7core_dev->socket);



	mci->ctl_name = kasprintf(GFP_KERNEL, "i7 core #%d", i7core_dev->socket);

	if (!mci->ctl_name) {

		rc = -ENOMEM;

		goto fail1;

	}



	mci->dev_name = pci_name(i7core_dev->pdev[0]);

	mci->ctl_page_to_phys = NULL;
@@ -2214,6 +2219,8 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev) 


fail0:

	kfree(mci->ctl_name);



fail1:

	edac_mc_free(mci);

	i7core_dev->mci = NULL;

	return rc;

drivers/edac/sb_edac.c

+5 −0
Original line number Diff line number Diff line
@@ -3287,6 +3287,11 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type) 
		break;

	}



	if (!mci->ctl_name) {

		rc = -ENOMEM;

		goto fail0;

	}



	/* Get dimm basic config and the memory layout */

	rc = get_dimm_config(mci);

	if (rc < 0) {

drivers/edac/skx_edac.c

+7 −2
Original line number Diff line number Diff line
@@ -464,8 +464,12 @@ static int skx_register_mci(struct skx_imc *imc) 
	pvt = mci->pvt_info;

	pvt->imc = imc;



	mci->ctl_name = kasprintf(GFP_KERNEL, "Skylake Socket#%d IMC#%d",

				  imc->node_id, imc->lmc);

	mci->ctl_name = kasprintf(GFP_KERNEL, "Skylake Socket#%d IMC#%d", imc->node_id, imc->lmc);

	if (!mci->ctl_name) {

		rc = -ENOMEM;

		goto fail0;

	}



	mci->mtype_cap = MEM_FLAG_DDR4;

	mci->edac_ctl_cap = EDAC_FLAG_NONE;

	mci->edac_cap = EDAC_FLAG_NONE;
@@ -491,6 +495,7 @@ static int skx_register_mci(struct skx_imc *imc) 


fail:

	kfree(mci->ctl_name);

fail0:

	edac_mc_free(mci);

	imc->mci = NULL;

	return rc;