fix backport issue with drm 3.18 and 4.4 patch

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 35f7800ece6ac9ac6766fa727c9010d1f1e5a4df..c5edf1fe3f5521f4ee395927afee9e4b6d36ed42 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 --- 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 1021d028af4de4382b0684e5179fbcf414e00b60..3b7ede9b9508ed4cf27044257ce5fe4e746f2fa0 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
  
  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 35f7800ece6ac9ac6766fa727c9010d1f1e5a4df..c5edf1fe3f5521f4ee395927afee9e4b6d36ed42 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 --- 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 1021d028af4de4382b0684e5179fbcf414e00b60..3b7ede9b9508ed4cf27044257ce5fe4e746f2fa0 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
  
  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]));