1 files changed, 13 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index f7f2aa71d8d9..2835cacd0d08 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1365,15 +1365,20 @@ static void request_record_user_bo(struct i915_request *request,
 {
         struct i915_capture_list *c;
         struct drm_i915_error_object **bo;
-        long count;
+        long count, max;
 
-        count = 0;
+        max = 0;
         for (c = request->capture_list; c; c = c->next)
-                count++;
+                max++;
+        if (!max)
+                return;
 
-        bo = NULL;
-        if (count)
-                bo = kcalloc(count, sizeof(*bo), GFP_ATOMIC);
+        bo = kmalloc_array(max, sizeof(*bo), GFP_ATOMIC);
+        if (!bo) {
+                /* If we can't capture everything, try to capture something. */
+                max = min_t(long, max, PAGE_SIZE / sizeof(*bo));
+                bo = kmalloc_array(max, sizeof(*bo), GFP_ATOMIC);
+        }
         if (!bo)
                 return;
 
@@ -1382,7 +1387,8 @@ static void request_record_user_bo(struct i915_request *request,
                 bo[count] = i915_error_object_create(request->i915, c->vma);
                 if (!bo[count])
                         break;
-                count++;
+                if (++count == max)
+                        break;
         }
 
         ee->user_bo = bo;