Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[J-linux.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_helpers.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index b0fea0856866d68b2e78a9f141effe2777ea26ee..6cbbb71d752beca0052c6e7db287df5a29c3e74e 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -907,14 +907,14 @@ dm_helpers_probe_acpi_edid(void *data, u8 *buf, unsigned int block, size_t len)
        struct drm_connector *connector = data;
        struct acpi_device *acpidev = ACPI_COMPANION(connector->dev->dev);
        unsigned char start = block * EDID_LENGTH;
-       void *edid;
+       struct edid *edid;
        int r;
 
        if (!acpidev)
                return -ENODEV;
 
        /* fetch the entire edid from BIOS */
-       r = acpi_video_get_edid(acpidev, ACPI_VIDEO_DISPLAY_LCD, -1, &edid);
+       r = acpi_video_get_edid(acpidev, ACPI_VIDEO_DISPLAY_LCD, -1, (void *)&edid);
        if (r < 0) {
                drm_dbg(connector->dev, "Failed to get EDID from ACPI: %d\n", r);
                return r;
@@ -924,7 +924,14 @@ dm_helpers_probe_acpi_edid(void *data, u8 *buf, unsigned int block, size_t len)
                goto cleanup;
        }
 
-       memcpy(buf, edid + start, len);
+       /* sanity check */
+       if (edid->revision < 4 || !(edid->input & DRM_EDID_INPUT_DIGITAL) ||
+           (edid->input & DRM_EDID_DIGITAL_TYPE_MASK) == DRM_EDID_DIGITAL_TYPE_UNDEF) {
+               r = -EINVAL;
+               goto cleanup;
+       }
+
+       memcpy(buf, (void *)edid + start, len);
        r = 0;
 
 cleanup: