6.7-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jithu Joseph jithu.joseph@intel.com
[ Upstream commit 8c898ec07a2fc1d4694e81097a48e94a3816308d ]
Missing release_firmware() due to error handling blocked any future image loading.
Fix the return code and release_fiwmare() to release the bad image.
Fixes: 25a76dbb36dd ("platform/x86/intel/ifs: Validate image size") Reported-by: Pengfei Xu pengfei.xu@intel.com Signed-off-by: Jithu Joseph jithu.joseph@intel.com Signed-off-by: Ashok Raj ashok.raj@intel.com Tested-by: Pengfei Xu pengfei.xu@intel.com Reviewed-by: Tony Luck tony.luck@intel.com Reviewed-by: Ilpo Järvinen ilpo.jarvinen@linux.intel.com Link: https://lore.kernel.org/r/20240125082254.424859-2-ashok.raj@intel.com Signed-off-by: Hans de Goede hdegoede@redhat.com Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/platform/x86/intel/ifs/load.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c index a1ee1a74fc3c..2cf3b4a8813f 100644 --- a/drivers/platform/x86/intel/ifs/load.c +++ b/drivers/platform/x86/intel/ifs/load.c @@ -399,7 +399,8 @@ int ifs_load_firmware(struct device *dev) if (fw->size != expected_size) { dev_err(dev, "File size mismatch (expected %u, actual %zu). Corrupted IFS image.\n", expected_size, fw->size); - return -EINVAL; + ret = -EINVAL; + goto release; }
ret = image_sanity_check(dev, (struct microcode_header_intel *)fw->data);