iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/x86/intel/ifs: Validate image size

Browse Source 
Perform additional validation prior to loading IFS image.

Error out if the size of the file being loaded doesn't match the size
specified in the header.

Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tested-by: Pengfei Xu <pengfei.xu@intel.com>
Link: https://lore.kernel.org/r/20231005195137.3117166-6-jithu.joseph@intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Jithu Joseph 2023-10-05 12:51:33 -07:00 committed by Ilpo Järvinen
parent 72b96ee29e
commit 25a76dbb36
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/platform/x86/intel/ifs/load.c
View File

@ -375,6 +375,7 @@ int ifs_load_firmware(struct device *dev)
{ {
const struct ifs_test_caps *test = ifs_get_test_caps(dev); const struct ifs_test_caps *test = ifs_get_test_caps(dev);
struct ifs_data *ifsd = ifs_get_data(dev); struct ifs_data *ifsd = ifs_get_data(dev);
unsigned int expected_size;
const struct firmware *fw; const struct firmware *fw;
char scan_path[64]; char scan_path[64];
int ret = -EINVAL; int ret = -EINVAL;
@ -389,6 +390,13 @@ int ifs_load_firmware(struct device *dev)
goto done; goto done;
} }
expected_size = ((struct microcode_header_intel *)fw->data)->totalsize;
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 = image_sanity_check(dev, (struct microcode_header_intel *)fw->data); ret = image_sanity_check(dev, (struct microcode_header_intel *)fw->data);
if (ret) if (ret)
goto release; goto release;