diff options
| author | Ilpo Järvinen <[email protected]> | 2022-12-14 16:49:52 +0200 |
|---|---|---|
| committer | Xu Yilun <[email protected]> | 2022-12-30 10:49:52 +0800 |
| commit | 60ce26d10e5850f33cc76fce52f5377045e75a15 (patch) | |
| tree | b280da66b4966b201addfe2e2ed7febc122cbfdd | |
| parent | 65ea840afd508194b0ee903256162aa87e46ec30 (diff) | |
fpga: m10bmc-sec: Fix probe rollback
Handle probe error rollbacks properly to avoid leaks.
Fixes: 5cd339b370e2 ("fpga: m10bmc-sec: add max10 secure update functions")
Reviewed-by: Matthew Gerlach <[email protected]>
Reviewed-by: Russ Weight <[email protected]>
Reviewed-by: Marco Pagani <[email protected]>
Signed-off-by: Ilpo Järvinen <[email protected]>
Cc: [email protected]
Acked-by: Xu Yilun <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Xu Yilun <[email protected]>
| -rw-r--r-- | drivers/fpga/intel-m10-bmc-sec-update.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c index 79d48852825e..03f1bd81c434 100644 --- a/drivers/fpga/intel-m10-bmc-sec-update.c +++ b/drivers/fpga/intel-m10-bmc-sec-update.c @@ -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) |