Skip to content

Commit 8d9f426

Browse files
keesopsiff
authored andcommitted
staging: media: atomisp: Fix stack buffer overflow in gmin_get_var_int()
[ Upstream commit ee4cf798202d285dcbe85e4467a094c44f5ed8e6 ] When gmin_get_config_var() calls efi.get_variable() and the EFI variable is larger than the expected buffer size, two behaviors combine to create a stack buffer overflow: 1. gmin_get_config_var() does not return the proper error code when efi.get_variable() fails. It returns the stale 'ret' value from earlier operations instead of indicating the EFI failure. 2. When efi.get_variable() returns EFI_BUFFER_TOO_SMALL, it updates *out_len to the required buffer size but writes no data to the output buffer. However, due to bug #1, gmin_get_var_int() believes the call succeeded. The caller gmin_get_var_int() then performs: - Allocates val[CFG_VAR_NAME_MAX + 1] (65 bytes) on stack - Calls gmin_get_config_var(dev, is_gmin, var, val, &len) with len=64 - If EFI variable is >64 bytes, efi.get_variable() sets len=required_size - Due to bug #1, thinks call succeeded with len=required_size - Executes val[len] = 0, writing past end of 65-byte stack buffer This creates a stack buffer overflow when EFI variables are larger than 64 bytes. Since EFI variables can be controlled by firmware or system configuration, this could potentially be exploited for code execution. Fix the bug by returning proper error codes from gmin_get_config_var() based on EFI status instead of stale 'ret' value. The gmin_get_var_int() function is called during device initialization for camera sensor configuration on Intel Bay Trail and Cherry Trail platforms using the atomisp camera stack. Reported-by: zepta <[email protected]> Closes: https://lore.kernel.org/all/CAPBS6KoQyM7FMdPwOuXteXsOe44X4H3F8Fw+y_qWq6E+OdmxQA@mail.gmail.com Fixes: 38d4f74 ("media: atomisp_gmin_platform: stop abusing efivar API") Reviewed-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 3d672fe065aa00f4d66f42e3c9720f69a3ed43e7)
1 parent 8eca2d8 commit 8d9f426

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,14 +1358,15 @@ static int gmin_get_config_var(struct device *maindev,
13581358
if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))
13591359
status = efi.get_variable(var16, &GMIN_CFG_VAR_EFI_GUID, NULL,
13601360
(unsigned long *)out_len, out);
1361-
if (status == EFI_SUCCESS)
1361+
if (status == EFI_SUCCESS) {
13621362
dev_info(maindev, "found EFI entry for '%s'\n", var8);
1363-
else if (is_gmin)
1363+
return 0;
1364+
}
1365+
if (is_gmin)
13641366
dev_info(maindev, "Failed to find EFI gmin variable %s\n", var8);
13651367
else
13661368
dev_info(maindev, "Failed to find EFI variable %s\n", var8);
1367-
1368-
return ret;
1369+
return -ENOENT;
13691370
}
13701371

13711372
int gmin_get_var_int(struct device *dev, bool is_gmin, const char *var, int def)

0 commit comments

Comments
 (0)