diff options
| author | Lingfeng Yang <lfy@google.com> | 2020-04-16 11:49:07 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2020-04-22 16:26:40 -0700 |
| commit | a43b80a692f020db340b20cb787e60560e9194aa (patch) | |
| tree | a0462aae403ddfb23d40aa5f3e1ae6c08c560e5c | |
| parent | 3dad80a7f34c4b2dafeb1a9cf8ac3790699ba6d5 (diff) | |
| download | cuttlefish-modules-a43b80a692f020db340b20cb787e60560e9194aa.tar.gz | |
CHROMIUM: drm/virtgpu: fix various warnings
>> drivers/gpu/drm/virtio/virtgpu_ioctl.c:688:9: warning: 'ret' may be
used uninitialized in this function [-Wmaybe-uninitialized]
>> drivers/gpu/drm/virtio/virtgpu_ioctl.c:742:2: warning: 'request_id'
may be used uninitialized in this function [-Wmaybe-uninitialized]
>> drivers/gpu/drm/virtio/virtgpu_vq.c:1097:30: sparse:
expected restricted __le32 [usertype] response_size
BUG=chromium:924405
TEST=glxgears on Crostini
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1818731
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
Bug: 153580313
Signed-off-by: Lingfeng Yang <lfy@google.com>
Change-Id: Ie5d93558d597dabb2dd673248aa8a1301913947c
| -rw-r--r-- | virtio_gpu/virtgpu_ioctl.c | 5 | ||||
| -rw-r--r-- | virtio_gpu/virtgpu_vq.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/virtio_gpu/virtgpu_ioctl.c b/virtio_gpu/virtgpu_ioctl.c index ca89bc4..fd09573 100644 --- a/virtio_gpu/virtgpu_ioctl.c +++ b/virtio_gpu/virtgpu_ioctl.c @@ -595,7 +595,7 @@ static int virtio_gpu_resource_create_v2_ioctl(struct drm_device *dev, bool use_dma_api = !virtio_has_iommu_quirk(vgdev->vdev); void __user *args = u64_to_user_ptr(rc_v2->args); - total_size = offset = 0; + ret = total_size = offset = 0; params.size = rc_v2->size; params.guest_memory_type = rc_v2->guest_memory_type; params.resource_v2 = true; @@ -606,7 +606,6 @@ static int virtio_gpu_resource_create_v2_ioctl(struct drm_device *dev, return PTR_ERR(obj); if (!obj->pages) { - int ret; ret = virtio_gpu_object_get_sg_table(vgdev, obj); if (ret) goto err_free_obj; @@ -697,7 +696,7 @@ static int virtio_gpu_allocation_metadata_request_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { void *request; - uint32_t request_id; + uint32_t request_id = 0; struct drm_virtgpu_allocation_metadata_request *amr = data; struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_allocation_metadata_response *response; diff --git a/virtio_gpu/virtgpu_vq.c b/virtio_gpu/virtgpu_vq.c index 210b69f..2392cdb 100644 --- a/virtio_gpu/virtgpu_vq.c +++ b/virtio_gpu/virtgpu_vq.c @@ -1037,8 +1037,8 @@ virtio_gpu_cmd_allocation_metadata(struct virtio_gpu_device *vgdev, memset(cmd_p, 0, sizeof(*cmd_p)); cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_ALLOCATION_METADATA); cmd_p->request_id = cpu_to_le32(request_id); - cmd_p->request_size = request_size; - cmd_p->response_size = response_size; + cmd_p->request_size = cpu_to_le32(request_size); + cmd_p->response_size = cpu_to_le32(response_size); vbuf->data_buf = request; vbuf->data_size = request_size; |