]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/amdgpu: Bound GPIO I2C table entry count from VBIOS
authorCandice Li <candice.li@amd.com>
Wed, 13 May 2026 04:31:57 +0000 (12:31 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 May 2026 15:52:03 +0000 (11:52 -0400)
Reject undersized tables and cap the derived entry count
to AMDGPU_MAX_I2C_BUS so we do not overrun adev->i2c_bus[]
or walk an absurd number of entries on corrupt size fields.

Signed-off-by: Candice Li <candice.li@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c

index 3698dd0330ff8117c0e3c2be93a2a30aa99a7105..acd22bff1882d1f9f270e42e42a979d8d86c2c8f 100644 (file)
 #include "atombios_encoders.h"
 #include "bif/bif_4_1_d.h"
 
+/* VBIOS-reported table size is unchecked against the image; cap iterations and
+ * adev->i2c_bus[] indexing to AMDGPU_MAX_I2C_BUS.
+ */
+static int amdgpu_atombios_gpio_i2c_num_entries(uint16_t size)
+{
+       u32 bytes;
+
+       if (size < sizeof(ATOM_COMMON_TABLE_HEADER))
+               return 0;
+
+       bytes = size - sizeof(ATOM_COMMON_TABLE_HEADER);
+       return (int)min_t(u32, bytes / sizeof(ATOM_GPIO_I2C_ASSIGMENT),
+                         AMDGPU_MAX_I2C_BUS);
+}
+
 static struct amdgpu_i2c_bus_rec amdgpu_atombios_get_bus_rec_for_i2c_gpio(ATOM_GPIO_I2C_ASSIGMENT *gpio)
 {
        struct amdgpu_i2c_bus_rec i2c;
@@ -96,8 +111,7 @@ struct amdgpu_i2c_bus_rec amdgpu_atombios_lookup_i2c_gpio(struct amdgpu_device *
        if (amdgpu_atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) {
                i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset);
 
-               num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
-                       sizeof(ATOM_GPIO_I2C_ASSIGMENT);
+               num_indices = amdgpu_atombios_gpio_i2c_num_entries(size);
 
                gpio = &i2c_info->asGPIO_Info[0];
                for (i = 0; i < num_indices; i++) {
@@ -127,8 +141,7 @@ void amdgpu_atombios_i2c_init(struct amdgpu_device *adev)
        if (amdgpu_atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) {
                i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset);
 
-               num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
-                       sizeof(ATOM_GPIO_I2C_ASSIGMENT);
+               num_indices = amdgpu_atombios_gpio_i2c_num_entries(size);
 
                gpio = &i2c_info->asGPIO_Info[0];
                for (i = 0; i < num_indices; i++) {
@@ -158,8 +171,7 @@ void amdgpu_atombios_oem_i2c_init(struct amdgpu_device *adev, u8 i2c_id)
        if (amdgpu_atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) {
                i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset);
 
-               num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) /
-                       sizeof(ATOM_GPIO_I2C_ASSIGMENT);
+               num_indices = amdgpu_atombios_gpio_i2c_num_entries(size);
 
                gpio = &i2c_info->asGPIO_Info[0];
                for (i = 0; i < num_indices; i++) {