diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2690-amdgpu-dc-Fix-potential-null-dereferences-in-amdgpu_.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2690-amdgpu-dc-Fix-potential-null-dereferences-in-amdgpu_.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2690-amdgpu-dc-Fix-potential-null-dereferences-in-amdgpu_.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2690-amdgpu-dc-Fix-potential-null-dereferences-in-amdgpu_.patch new file mode 100644 index 00000000..949589d3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2690-amdgpu-dc-Fix-potential-null-dereferences-in-amdgpu_.patch @@ -0,0 +1,54 @@ +From 00945f34e5a39d48bb666c20a3d02daed42ab6cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ernst=20Sj=C3=B6strand?= <ernstp@gmail.com> +Date: Tue, 7 Nov 2017 21:06:58 +0100 +Subject: [PATCH 2690/4131] amdgpu/dc: Fix potential null dereferences in + amdgpu_dm.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Acked-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Ernst Sjöstrand <ernstp@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 903e6ed..8e8d585 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -2670,6 +2670,8 @@ dm_crtc_duplicate_state(struct drm_crtc *crtc) + return NULL; + + state = kzalloc(sizeof(*state), GFP_KERNEL); ++ if (!state) ++ return NULL; + + __drm_atomic_helper_crtc_duplicate_state(crtc, &state->base); + +@@ -3736,6 +3738,8 @@ create_i2c(struct ddc_service *ddc_service, + struct amdgpu_i2c_adapter *i2c; + + i2c = kzalloc(sizeof(struct amdgpu_i2c_adapter), GFP_KERNEL); ++ if (!i2c) ++ return NULL; + i2c->base.owner = THIS_MODULE; + i2c->base.class = I2C_CLASS_DDC; + i2c->base.dev.parent = &adev->pdev->dev; +@@ -3766,6 +3770,11 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, + DRM_DEBUG_DRIVER("%s()\n", __func__); + + i2c = create_i2c(link->ddc, link->link_index, &res); ++ if (!i2c) { ++ DRM_ERROR("Failed to create i2c adapter data\n"); ++ return -ENOMEM; ++ } ++ + aconnector->i2c = i2c; + res = i2c_add_adapter(&i2c->base); + +-- +2.7.4 + |