Unverified Commit 60ce26d1 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Xu Yilun
Browse files

fpga: m10bmc-sec: Fix probe rollback 



Handle probe error rollbacks properly to avoid leaks.

Fixes: 5cd339b3 ("fpga: m10bmc-sec: add max10 secure update functions")
Reviewed-by: default avatarMatthew Gerlach <matthew.gerlach@linux.intel.com>
Reviewed-by: default avatarRuss Weight <russell.h.weight@intel.com>
Reviewed-by: default avatarMarco Pagani <marpagan@redhat.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: stable@vger.kernel.org
Acked-by: default avatarXu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20221214144952.8392-1-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>
parent 65ea840a

drivers/fpga/intel-m10-bmc-sec-update.c

+12 −5
Original line number Diff line number Diff line
@@ -574,20 +574,27 @@ static int m10bmc_sec_probe(struct platform_device *pdev) 
	len = scnprintf(buf, SEC_UPDATE_LEN_MAX, "secure-update%d",

			sec->fw_name_id);

	sec->fw_name = kmemdup_nul(buf, len, GFP_KERNEL);

	if (!sec->fw_name)

		return -ENOMEM;

	if (!sec->fw_name) {

		ret = -ENOMEM;

		goto fw_name_fail;

	}



	fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name,

				       &m10bmc_ops, sec);

	if (IS_ERR(fwl)) {

		dev_err(sec->dev, "Firmware Upload driver failed to start\n");

		kfree(sec->fw_name);

		xa_erase(&fw_upload_xa, sec->fw_name_id);

		return PTR_ERR(fwl);

		ret = PTR_ERR(fwl);

		goto fw_uploader_fail;

	}



	sec->fwl = fwl;

	return 0;



fw_uploader_fail:

	kfree(sec->fw_name);

fw_name_fail:

	xa_erase(&fw_upload_xa, sec->fw_name_id);

	return ret;

}



static int m10bmc_sec_remove(struct platform_device *pdev)