提交 0fbc2074 编写于 作者: M Michael S. Tsirkin 提交者: Paolo Bonzini

kvm: zero-initialize KVM_SET_GSI_ROUTING input

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: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NGleb Natapov <gleb@redhat.com>
上级 fa4ba923
...@@ -1016,11 +1016,8 @@ static void kvm_add_routing_entry(KVMState *s, ...@@ -1016,11 +1016,8 @@ static void kvm_add_routing_entry(KVMState *s,
} }
n = s->irq_routes->nr++; n = s->irq_routes->nr++;
new = &s->irq_routes->entries[n]; new = &s->irq_routes->entries[n];
memset(new, 0, sizeof(*new));
new->gsi = entry->gsi; *new = *entry;
new->type = entry->type;
new->flags = entry->flags;
new->u = entry->u;
set_gsi(s, entry->gsi); set_gsi(s, entry->gsi);
} }
...@@ -1037,9 +1034,7 @@ static int kvm_update_routing_entry(KVMState *s, ...@@ -1037,9 +1034,7 @@ static int kvm_update_routing_entry(KVMState *s,
continue; continue;
} }
entry->type = new_entry->type; *entry = *new_entry;
entry->flags = new_entry->flags;
entry->u = new_entry->u;
kvm_irqchip_commit_routes(s); kvm_irqchip_commit_routes(s);
...@@ -1051,7 +1046,7 @@ static int kvm_update_routing_entry(KVMState *s, ...@@ -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) 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); assert(pin < s->gsi_count);
...@@ -1164,7 +1159,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg) ...@@ -1164,7 +1159,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
return virq; return virq;
} }
route = g_malloc(sizeof(KVMMSIRoute)); route = g_malloc0(sizeof(KVMMSIRoute));
route->kroute.gsi = virq; route->kroute.gsi = virq;
route->kroute.type = KVM_IRQ_ROUTING_MSI; route->kroute.type = KVM_IRQ_ROUTING_MSI;
route->kroute.flags = 0; route->kroute.flags = 0;
...@@ -1186,7 +1181,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg) ...@@ -1186,7 +1181,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
int kvm_irqchip_add_msi_route(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; int virq;
if (!kvm_gsi_routing_enabled()) { if (!kvm_gsi_routing_enabled()) {
...@@ -1213,7 +1208,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) ...@@ -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) 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()) { if (!kvm_irqchip_in_kernel()) {
return -ENOSYS; return -ENOSYS;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册