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

Commit 51ab70be authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Sinclair Yeh
Browse files

drm/vmwgfx: Limit the user-space command buffer size 



With older hardware versions, the user could specify arbitrarily large
command buffer sizes, causing a vmalloc / vmap space exhaustion.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Signed-off-by: default avatarSinclair Yeh <syeh@vmware.com>
Cc: stable@vger.kernel.org
parent 728c3b53

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+3 −3
Original line number Diff line number Diff line
@@ -3891,14 +3891,14 @@ static void *vmw_execbuf_cmdbuf(struct vmw_private *dev_priv, 
	int ret;



	*header = NULL;

	if (!dev_priv->cman || kernel_commands)

		return kernel_commands;



	if (command_size > SVGA_CB_MAX_SIZE) {

		DRM_ERROR("Command buffer is too large.\n");

		return ERR_PTR(-EINVAL);

	}



	if (!dev_priv->cman || kernel_commands)

		return kernel_commands;



	/* If possible, add a little space for fencing. */

	cmdbuf_size = command_size + 512;

	cmdbuf_size = min_t(size_t, cmdbuf_size, SVGA_CB_MAX_SIZE);