From 0e083c57afab418f549790d1745535c3f6e86304 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Nov 2017 15:44:15 +0100 Subject: [PATCH] fix backport issue with drm 3.18 and 4.4 patch --- queue-3.18/drm-msm-fix-an-integer-overflow-test.patch | 2 +- queue-3.18/drm-msm-fix-potential-buffer-overflow-issue.patch | 2 +- queue-4.4/drm-msm-fix-an-integer-overflow-test.patch | 2 +- queue-4.4/drm-msm-fix-potential-buffer-overflow-issue.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/queue-3.18/drm-msm-fix-an-integer-overflow-test.patch b/queue-3.18/drm-msm-fix-an-integer-overflow-test.patch index 35f7800ece6..c5edf1fe3f5 100644 --- a/queue-3.18/drm-msm-fix-an-integer-overflow-test.patch +++ b/queue-3.18/drm-msm-fix-an-integer-overflow-test.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -37,7 +37,7 @@ static struct msm_gem_submit *submit_cre - struct msm_gpu *gpu, uint32_t int nr) + struct msm_gpu *gpu, uint32_t nr) { struct msm_gem_submit *submit; - uint64_t sz = sizeof(*submit) + (nr * sizeof(submit->bos[0])); diff --git a/queue-3.18/drm-msm-fix-potential-buffer-overflow-issue.patch b/queue-3.18/drm-msm-fix-potential-buffer-overflow-issue.patch index 1021d028af4..3b7ede9b950 100644 --- a/queue-3.18/drm-msm-fix-potential-buffer-overflow-issue.patch +++ b/queue-3.18/drm-msm-fix-potential-buffer-overflow-issue.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman static struct msm_gem_submit *submit_create(struct drm_device *dev, - struct msm_gpu *gpu, int nr) -+ struct msm_gpu *gpu, uint32_t int nr) ++ struct msm_gpu *gpu, uint32_t nr) { struct msm_gem_submit *submit; - int sz = sizeof(*submit) + (nr * sizeof(submit->bos[0])); diff --git a/queue-4.4/drm-msm-fix-an-integer-overflow-test.patch b/queue-4.4/drm-msm-fix-an-integer-overflow-test.patch index 35f7800ece6..c5edf1fe3f5 100644 --- a/queue-4.4/drm-msm-fix-an-integer-overflow-test.patch +++ b/queue-4.4/drm-msm-fix-an-integer-overflow-test.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -37,7 +37,7 @@ static struct msm_gem_submit *submit_cre - struct msm_gpu *gpu, uint32_t int nr) + struct msm_gpu *gpu, uint32_t nr) { struct msm_gem_submit *submit; - uint64_t sz = sizeof(*submit) + (nr * sizeof(submit->bos[0])); diff --git a/queue-4.4/drm-msm-fix-potential-buffer-overflow-issue.patch b/queue-4.4/drm-msm-fix-potential-buffer-overflow-issue.patch index 1021d028af4..3b7ede9b950 100644 --- a/queue-4.4/drm-msm-fix-potential-buffer-overflow-issue.patch +++ b/queue-4.4/drm-msm-fix-potential-buffer-overflow-issue.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman static struct msm_gem_submit *submit_create(struct drm_device *dev, - struct msm_gpu *gpu, int nr) -+ struct msm_gpu *gpu, uint32_t int nr) ++ struct msm_gpu *gpu, uint32_t nr) { struct msm_gem_submit *submit; - int sz = sizeof(*submit) + (nr * sizeof(submit->bos[0])); -- 2.47.3