On 2024-01-26 at 20:15:46 +0100, Hans de Goede wrote:
Hi,
On 1/25/24 09:22, Ashok Raj wrote:
From: Jithu Joseph jithu.joseph@intel.com
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
Thank you for your patch/series, I've applied this patch (series) to my review-hans branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.g...
Note it will show up in the pdx86 review-hans branch once I've pushed my local branch there, which might take a while.
I will include this patch in my next fixes pull-req to Linus for the current kernel development cycle.
FYR.
[ CC stable@vger.kernel.org ] Missed CC: Stable Tag.
This (follow-up) patch is now upstream into v6.7-rc1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
Looks like linux-6.7.y needs the above fixed patch too.
Best Regards, Thanks!
Regards,
Hans
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);