Commit fce8afd7 authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin

virtio-mem: Don't rely on implicit compiler padding for requests

The compiler will add padding after the last member, make that explicit.
The size of a request is always 24 bytes. The size of a response always
10 bytes. Add compile-time checks.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Cc: teawater <teawaterz@linux.alibaba.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/20200515101402.16597-1-david@redhat.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 72f9525a
...@@ -1770,6 +1770,9 @@ static int virtio_mem_probe(struct virtio_device *vdev) ...@@ -1770,6 +1770,9 @@ static int virtio_mem_probe(struct virtio_device *vdev)
struct virtio_mem *vm; struct virtio_mem *vm;
int rc = -EINVAL; int rc = -EINVAL;
BUILD_BUG_ON(sizeof(struct virtio_mem_req) != 24);
BUILD_BUG_ON(sizeof(struct virtio_mem_resp) != 10);
vdev->priv = vm = kzalloc(sizeof(*vm), GFP_KERNEL); vdev->priv = vm = kzalloc(sizeof(*vm), GFP_KERNEL);
if (!vm) if (!vm)
return -ENOMEM; return -ENOMEM;
......
...@@ -103,16 +103,19 @@ ...@@ -103,16 +103,19 @@
struct virtio_mem_req_plug { struct virtio_mem_req_plug {
__virtio64 addr; __virtio64 addr;
__virtio16 nb_blocks; __virtio16 nb_blocks;
__virtio16 padding[3];
}; };
struct virtio_mem_req_unplug { struct virtio_mem_req_unplug {
__virtio64 addr; __virtio64 addr;
__virtio16 nb_blocks; __virtio16 nb_blocks;
__virtio16 padding[3];
}; };
struct virtio_mem_req_state { struct virtio_mem_req_state {
__virtio64 addr; __virtio64 addr;
__virtio16 nb_blocks; __virtio16 nb_blocks;
__virtio16 padding[3];
}; };
struct virtio_mem_req { struct virtio_mem_req {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment