aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_msg.c')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_msg.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index 97000996b8dc..cdff99211602 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -328,7 +328,7 @@ int vmw_host_get_guestinfo(const char *guest_info_param,
328{ 328{
329 struct rpc_channel channel; 329 struct rpc_channel channel;
330 char *msg, *reply = NULL; 330 char *msg, *reply = NULL;
331 size_t msg_len, reply_len = 0; 331 size_t reply_len = 0;
332 int ret = 0; 332 int ret = 0;
333 333
334 334
@@ -338,15 +338,12 @@ int vmw_host_get_guestinfo(const char *guest_info_param,
338 if (!guest_info_param || !length) 338 if (!guest_info_param || !length)
339 return -EINVAL; 339 return -EINVAL;
340 340
341 msg_len = strlen(guest_info_param) + strlen("info-get ") + 1; 341 msg = kasprintf(GFP_KERNEL, "info-get %s", guest_info_param);
342 msg = kzalloc(msg_len, GFP_KERNEL);
343 if (!msg) { 342 if (!msg) {
344 DRM_ERROR("Cannot allocate memory to get %s", guest_info_param); 343 DRM_ERROR("Cannot allocate memory to get %s", guest_info_param);
345 return -ENOMEM; 344 return -ENOMEM;
346 } 345 }
347 346
348 sprintf(msg, "info-get %s", guest_info_param);
349
350 if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM) || 347 if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM) ||
351 vmw_send_msg(&channel, msg) || 348 vmw_send_msg(&channel, msg) ||
352 vmw_recv_msg(&channel, (void *) &reply, &reply_len) || 349 vmw_recv_msg(&channel, (void *) &reply, &reply_len) ||
@@ -388,7 +385,6 @@ int vmw_host_log(const char *log)
388{ 385{
389 struct rpc_channel channel; 386 struct rpc_channel channel;
390 char *msg; 387 char *msg;
391 int msg_len;
392 int ret = 0; 388 int ret = 0;
393 389
394 390
@@ -398,15 +394,12 @@ int vmw_host_log(const char *log)
398 if (!log) 394 if (!log)
399 return ret; 395 return ret;
400 396
401 msg_len = strlen(log) + strlen("log ") + 1; 397 msg = kasprintf(GFP_KERNEL, "log %s", log);
402 msg = kzalloc(msg_len, GFP_KERNEL);
403 if (!msg) { 398 if (!msg) {
404 DRM_ERROR("Cannot allocate memory for log message\n"); 399 DRM_ERROR("Cannot allocate memory for log message\n");
405 return -ENOMEM; 400 return -ENOMEM;
406 } 401 }
407 402
408 sprintf(msg, "log %s", log);
409
410 if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM) || 403 if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM) ||
411 vmw_send_msg(&channel, msg) || 404 vmw_send_msg(&channel, msg) ||
412 vmw_close_channel(&channel)) { 405 vmw_close_channel(&channel)) {