platform/x86/intel/ifs: Call release_firmware() when handling errors.

jithu83 · jwrdegoede · commit 8c898ec07a2f · 2024-01-26T20:12:16.000+01:00
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: 25a76db ("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>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,8 @@ int ifs_load_firmware(struct device *dev)`
`399`	`399`	`if (fw->size != expected_size) {`
`400`	`400`	`dev_err(dev, "File size mismatch (expected %u, actual %zu). Corrupted IFS image.\n",`
`401`	`401`	`expected_size, fw->size);`
`402`		`- return -EINVAL;`
	`402`	`+ ret = -EINVAL;`
	`403`	`+ goto release;`
`403`	`404`	`}`
`404`	`405`
`405`	`406`	`ret = image_sanity_check(dev, (struct microcode_header_intel *)fw->data);`