diff options
author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-06-19 14:28:33 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2019-07-11 16:06:39 -0400 |
commit | 211f70ff1daa3b3bb877f0f6fa85a42ef50f8341 (patch) | |
tree | 1e5e0e63dfaea02cfe4e31ab3d09e22ee17a080c /drivers/scsi | |
parent | 169a126c6e88a99578a309a9021f314b5d532c5f (diff) |
scsi: virtio_scsi: Use struct_size() helper
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct virtio_scsi {
...
struct virtio_scsi_vq req_vqs[];
};
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.
So, replace the following form:
sizeof(*vscsi) + sizeof(vscsi->req_vqs[0]) * num_queues
with:
struct_size(vscsi, req_vqs, num_queues)
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/virtio_scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index 13f1b3b9923a..ed4f79bffc73 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -795,7 +795,7 @@ static int virtscsi_probe(struct virtio_device *vdev) num_targets = virtscsi_config_get(vdev, max_target) + 1; shost = scsi_host_alloc(&virtscsi_host_template, - sizeof(*vscsi) + sizeof(vscsi->req_vqs[0]) * num_queues); + struct_size(vscsi, req_vqs, num_queues)); if (!shost) return -ENOMEM; |