From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: Gleb Natapov <gleb@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, kvm@vger.kernel.org Subject: [PULL 06/21] kvm: zero-initialize KVM_SET_GSI_ROUTING input Date: Thu, 20 Jun 2013 16:10:20 +0300 [thread overview] Message-ID: <1371730033-5554-7-git-send-email-mst@redhat.com> (raw) In-Reply-To: <1371730033-5554-1-git-send-email-mst@redhat.com> 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. While mostly harmless, this would prevent us from reusing these fields for something useful in the future. 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> --- kvm-all.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 405480e..f119ce1 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1006,11 +1006,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); @@ -1029,9 +1026,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); @@ -1043,7 +1038,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); @@ -1156,7 +1151,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; @@ -1177,7 +1172,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()) { @@ -1203,7 +1198,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; -- MST
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Cc: Paolo Bonzini <pbonzini@redhat.com>, kvm@vger.kernel.org, Gleb Natapov <gleb@redhat.com> Subject: [Qemu-devel] [PULL 06/21] kvm: zero-initialize KVM_SET_GSI_ROUTING input Date: Thu, 20 Jun 2013 16:10:20 +0300 [thread overview] Message-ID: <1371730033-5554-7-git-send-email-mst@redhat.com> (raw) In-Reply-To: <1371730033-5554-1-git-send-email-mst@redhat.com> 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. While mostly harmless, this would prevent us from reusing these fields for something useful in the future. 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> --- kvm-all.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 405480e..f119ce1 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1006,11 +1006,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); @@ -1029,9 +1026,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); @@ -1043,7 +1038,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); @@ -1156,7 +1151,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; @@ -1177,7 +1172,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()) { @@ -1203,7 +1198,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; -- MST
next prev parent reply other threads:[~2013-06-20 13:09 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-20 13:08 [Qemu-devel] [PULL 00/21] pci,net,misc enhancements Michael S. Tsirkin 2013-06-20 13:08 ` [Qemu-devel] [PULL 01/21] range: add Range structure Michael S. Tsirkin 2013-06-20 13:08 ` [Qemu-devel] [PULL 03/21] pc: pass PCI hole ranges to Guests Michael S. Tsirkin 2013-06-20 13:08 ` [Qemu-devel] [PULL 04/21] pc_piix: cleanup init compat handling Michael S. Tsirkin 2013-06-20 13:10 ` [Qemu-devel] [PULL 05/21] e1000: cleanup process_tx_desc Michael S. Tsirkin 2013-06-20 13:10 ` Michael S. Tsirkin [this message] 2013-06-20 13:10 ` [Qemu-devel] [PULL 06/21] kvm: zero-initialize KVM_SET_GSI_ROUTING input Michael S. Tsirkin 2013-06-20 13:10 ` [PULL 07/21] kvm: skip system call when msi route is unchanged Michael S. Tsirkin 2013-06-20 13:10 ` [Qemu-devel] " Michael S. Tsirkin 2013-06-20 13:10 ` [Qemu-devel] [PULL 08/21] MAINTAINERS: s/Marcelo/Paolo/ Michael S. Tsirkin 2013-06-20 13:10 ` [Qemu-devel] [PULL 09/21] pvpanic: initialization cleanup Michael S. Tsirkin 2013-06-20 13:10 ` [Qemu-devel] [PULL 10/21] pvpanic: fix fwcfg for big endian hosts Michael S. Tsirkin 2013-06-20 13:10 ` [Qemu-devel] [PULL 11/21] net: add support of mac-programming over macvtap in QEMU side Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 13/21] pci: Move pci_read_devaddr to pci-hotplug-old.c Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 14/21] pci: Abolish pci_find_root_bus() Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 15/21] pci: Use helper to find device's root bus in pci_find_domain() Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 16/21] pci: Replace pci_find_domain() with more general pci_root_bus_path() Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 17/21] pci: Add root bus argument to pci_get_bus_devfn() Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 18/21] pci: Add root bus parameter to pci_nic_init() Michael S. Tsirkin 2013-06-20 17:07 ` Richard Henderson 2013-06-20 13:11 ` [Qemu-devel] [PULL 19/21] pci: Simpler implementation of primary PCI bus Michael S. Tsirkin 2013-06-20 13:11 ` [Qemu-devel] [PULL 20/21] pci: Remove domain from PCIHostBus Michael S. Tsirkin 2013-06-20 13:12 ` [Qemu-devel] [PULL 21/21] pci: Fold host_buses list into PCIHostState functionality Michael S. Tsirkin 2013-06-20 19:02 ` [Qemu-devel] [PULL 00/21] pci,net,misc enhancements Anthony Liguori 2013-06-20 20:34 ` Gleb Natapov 2013-06-20 20:46 ` Anthony Liguori 2013-06-21 13:10 ` Anthony Liguori 2013-06-23 11:38 ` Michael S. Tsirkin 2013-06-24 6:43 ` Amos Kong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1371730033-5554-7-git-send-email-mst@redhat.com \ --to=mst@redhat.com \ --cc=gleb@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.