From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuIgA-0000Il-LD for qemu-devel@nongnu.org; Wed, 03 Jul 2013 04:44:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UuIg9-0007Vt-Ef for qemu-devel@nongnu.org; Wed, 03 Jul 2013 04:44:46 -0400 Received: from mail-bk0-x234.google.com ([2a00:1450:4008:c01::234]:55048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UuIg9-0007Vk-8J for qemu-devel@nongnu.org; Wed, 03 Jul 2013 04:44:45 -0400 Received: by mail-bk0-f52.google.com with SMTP id d7so2771152bkh.25 for ; Wed, 03 Jul 2013 01:44:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 3 Jul 2013 10:44:29 +0200 Message-Id: <1372841072-22265-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1372841072-22265-1-git-send-email-pbonzini@redhat.com> References: <1372841072-22265-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] kvm: zero-initialize KVM_SET_GSI_ROUTING input List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, gleb@redhat.com, "Michael S. Tsirkin" From: "Michael S. Tsirkin" 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 Signed-off-by: Gleb Natapov --- kvm-all.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 12042f7..745b501 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -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); } @@ -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); @@ -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); @@ -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; @@ -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()) { @@ -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; -- 1.8.1.4