Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbcd1f5 authored by Lucas Stach's avatar Lucas Stach Committed by Greg Kroah-Hartman
Browse files

drm/etnaviv: relax submit size limits 



commit e3d26528e083e612314d4dcd713f3d5a26143ddc upstream.

While all userspace tried to limit commandstreams to 64K in size,
a bug in the Mesa driver lead to command streams of up to 128K
being submitted. Allow those to avoid breaking existing userspace.

Fixes: 6dfa2fab8ddd ("drm/etnaviv: limit submit sizes")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5463cfd8

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+2 −2
Original line number Diff line number Diff line
@@ -471,8 +471,8 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	if (args->stream_size > SZ_64K || args->nr_relocs > SZ_64K ||

	    args->nr_bos > SZ_64K || args->nr_pmrs > 128) {

	if (args->stream_size > SZ_128K || args->nr_relocs > SZ_128K ||

	    args->nr_bos > SZ_128K || args->nr_pmrs > 128) {

		DRM_ERROR("submit arguments out of size limits\n");

		return -EINVAL;

	}