Hi all,

Today's linux-next merge of the drm-misc-fixes tree got a conflict in:

  drivers/gpu/drm/drm_syncobj.c

between commit:

  0af298e62e5cf ("treewide: refresh kmalloc_obj() conversions")

from the origin tree and commit:

  6ca87397aeebc ("drm/syncobj: Limit the number of handles and use kvmalloc for 
user-sized arrays")

from the drm-misc-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/drm_syncobj.c
index 137397972a98a,c8a8c49d12fb2..0000000000000
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@@ -1051,7 -1062,7 +1062,7 @@@ static signed long drm_syncobj_array_wa
                lockdep_assert_none_held_once();
        }
  
-       points = kmalloc_objs(*points, count);
 -      points = kvmalloc_array(count, sizeof(*points), GFP_KERNEL);
++      points = kvmalloc_objs(*points, count);
        if (points == NULL)
                return -ENOMEM;
  
@@@ -1238,7 -1249,10 +1249,10 @@@ static int drm_syncobj_array_find(struc
        struct drm_syncobj **syncobjs;
        int ret;
  
-       handles = kmalloc_objs(*handles, count_handles);
+       if (count_handles > DRM_SYNCOBJ_MAX_HANDLES)
+               return -EINVAL;
+ 
 -      handles = kvmalloc_array(count_handles, sizeof(*handles), GFP_KERNEL);
++      handles = kvmalloc_objs(*handles, count_handles);
        if (handles == NULL)
                return -ENOMEM;
  
@@@ -1572,7 -1586,8 +1586,7 @@@ drm_syncobj_timeline_signal_ioctl(struc
        if (ret < 0)
                return ret;
  
-       points = kmalloc_objs(*points, args->count_handles);
 -      points = kvmalloc_array(args->count_handles, sizeof(*points),
 -                              GFP_KERNEL);
++      points = kvmalloc_objs(*points, args->count_handles);
        if (!points) {
                ret = -ENOMEM;
                goto out;

Attachment: signature.asc
Description: PGP signature

Reply via email to