Skip to content

Commit

Permalink
kvm: zero-initialize KVM_SET_GSI_ROUTING input
Browse files Browse the repository at this point in the history
kvm_add_routing_entry makes an attempt to
zero-initialize any new routing entry.
However, it fails to initialize padding
within the u field of the structure
kvm_irq_routing_entry.

Other functions like kvm_irqchip_update_msi_route
also fail to initialize the padding field in
kvm_irq_routing_entry.

It's better to just make sure all input is initialized.

Once it is, we can also drop complex field by field assignment and just
do the simple *a = *b to update a route entry.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
  • Loading branch information
mstsirkin authored and bonzini committed Jul 3, 2013
1 parent fa4ba92 commit 0fbc207
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions kvm-all.c
Expand Up @@ -1016,11 +1016,8 @@ static void kvm_add_routing_entry(KVMState *s,
}
n = s->irq_routes->nr++;
new = &s->irq_routes->entries[n];
memset(new, 0, sizeof(*new));
new->gsi = entry->gsi;
new->type = entry->type;
new->flags = entry->flags;
new->u = entry->u;

*new = *entry;

set_gsi(s, entry->gsi);
}
Expand All @@ -1037,9 +1034,7 @@ static int kvm_update_routing_entry(KVMState *s,
continue;
}

entry->type = new_entry->type;
entry->flags = new_entry->flags;
entry->u = new_entry->u;
*entry = *new_entry;

kvm_irqchip_commit_routes(s);

Expand All @@ -1051,7 +1046,7 @@ static int kvm_update_routing_entry(KVMState *s,

void kvm_irqchip_add_irq_route(KVMState *s, int irq, int irqchip, int pin)
{
struct kvm_irq_routing_entry e;
struct kvm_irq_routing_entry e = {};

assert(pin < s->gsi_count);

Expand Down Expand Up @@ -1164,7 +1159,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
return virq;
}

route = g_malloc(sizeof(KVMMSIRoute));
route = g_malloc0(sizeof(KVMMSIRoute));
route->kroute.gsi = virq;
route->kroute.type = KVM_IRQ_ROUTING_MSI;
route->kroute.flags = 0;
Expand All @@ -1186,7 +1181,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)

int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
{
struct kvm_irq_routing_entry kroute;
struct kvm_irq_routing_entry kroute = {};
int virq;

if (!kvm_gsi_routing_enabled()) {
Expand All @@ -1213,7 +1208,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)

int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg)
{
struct kvm_irq_routing_entry kroute;
struct kvm_irq_routing_entry kroute = {};

if (!kvm_irqchip_in_kernel()) {
return -ENOSYS;
Expand Down

0 comments on commit 0fbc207

Please sign in to comment.