All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kvm: check dev parameter when updating msi route
@ 2018-02-02  4:51 P J P
  2018-02-02 19:35   ` [Qemu-devel] " Radim Krčmář
  0 siblings, 1 reply; 5+ messages in thread
From: P J P @ 2018-02-02  4:51 UTC (permalink / raw)
  To: kvm; +Cc: Paolo Bonzini, Guoxiang Niu, Prasad J Pandit

From: Prasad J Pandit <pjp@fedoraproject.org>

When updating message signalled interrupt(MSI) route in routine
kvm_irqchip_update_msi_route, device parameter could be null.
Add check to avoid null dereference.

Reported-by: Guoxiang Niu <niuguoxiang@huawei.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
 accel/kvm/kvm-all.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index f290f487a5..cb7613d282 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1167,7 +1167,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev)
     kroute.u.msi.address_lo = (uint32_t)msg.address;
     kroute.u.msi.address_hi = msg.address >> 32;
     kroute.u.msi.data = le32_to_cpu(msg.data);
-    if (pci_available && kvm_msi_devid_required()) {
+    if (pci_available && dev && kvm_msi_devid_required()) {
         kroute.flags = KVM_MSI_VALID_DEVID;
         kroute.u.msi.devid = pci_requester_id(dev);
     }
@@ -1205,7 +1205,7 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
     kroute.u.msi.address_lo = (uint32_t)msg.address;
     kroute.u.msi.address_hi = msg.address >> 32;
     kroute.u.msi.data = le32_to_cpu(msg.data);
-    if (pci_available && kvm_msi_devid_required()) {
+    if (pci_available && dev && kvm_msi_devid_required()) {
         kroute.flags = KVM_MSI_VALID_DEVID;
         kroute.u.msi.devid = pci_requester_id(dev);
     }
-- 
2.14.3

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] kvm: check dev parameter when updating msi route
  2018-02-02  4:51 [PATCH] kvm: check dev parameter when updating msi route P J P
@ 2018-02-02 19:35   ` Radim Krčmář
  0 siblings, 0 replies; 5+ messages in thread
From: Radim Krčmář @ 2018-02-02 19:35 UTC (permalink / raw)
  To: P J P; +Cc: kvm, Paolo Bonzini, Guoxiang Niu, Prasad J Pandit, qemu-devel

This should primarily go to the qemu devel list.  I've Cc'd it, but
reposting would be safer, thanks.


2018-02-02 10:21+0530, P J P:
> From: Prasad J Pandit <pjp@fedoraproject.org>
> 
> When updating message signalled interrupt(MSI) route in routine
> kvm_irqchip_update_msi_route, device parameter could be null.
> Add check to avoid null dereference.
> 
> Reported-by: Guoxiang Niu <niuguoxiang@huawei.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
>  accel/kvm/kvm-all.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index f290f487a5..cb7613d282 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -1167,7 +1167,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev)
>      kroute.u.msi.address_lo = (uint32_t)msg.address;
>      kroute.u.msi.address_hi = msg.address >> 32;
>      kroute.u.msi.data = le32_to_cpu(msg.data);
> -    if (pci_available && kvm_msi_devid_required()) {
> +    if (pci_available && dev && kvm_msi_devid_required()) {
>          kroute.flags = KVM_MSI_VALID_DEVID;
>          kroute.u.msi.devid = pci_requester_id(dev);
>      }
> @@ -1205,7 +1205,7 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
>      kroute.u.msi.address_lo = (uint32_t)msg.address;
>      kroute.u.msi.address_hi = msg.address >> 32;
>      kroute.u.msi.data = le32_to_cpu(msg.data);
> -    if (pci_available && kvm_msi_devid_required()) {
> +    if (pci_available && dev && kvm_msi_devid_required()) {
>          kroute.flags = KVM_MSI_VALID_DEVID;
>          kroute.u.msi.devid = pci_requester_id(dev);
>      }
> -- 
> 2.14.3
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH] kvm: check dev parameter when updating msi route
@ 2018-02-02 19:35   ` Radim Krčmář
  0 siblings, 0 replies; 5+ messages in thread
From: Radim Krčmář @ 2018-02-02 19:35 UTC (permalink / raw)
  To: P J P; +Cc: kvm, Paolo Bonzini, Guoxiang Niu, Prasad J Pandit, qemu-devel

This should primarily go to the qemu devel list.  I've Cc'd it, but
reposting would be safer, thanks.


2018-02-02 10:21+0530, P J P:
> From: Prasad J Pandit <pjp@fedoraproject.org>
> 
> When updating message signalled interrupt(MSI) route in routine
> kvm_irqchip_update_msi_route, device parameter could be null.
> Add check to avoid null dereference.
> 
> Reported-by: Guoxiang Niu <niuguoxiang@huawei.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
>  accel/kvm/kvm-all.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index f290f487a5..cb7613d282 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -1167,7 +1167,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev)
>      kroute.u.msi.address_lo = (uint32_t)msg.address;
>      kroute.u.msi.address_hi = msg.address >> 32;
>      kroute.u.msi.data = le32_to_cpu(msg.data);
> -    if (pci_available && kvm_msi_devid_required()) {
> +    if (pci_available && dev && kvm_msi_devid_required()) {
>          kroute.flags = KVM_MSI_VALID_DEVID;
>          kroute.u.msi.devid = pci_requester_id(dev);
>      }
> @@ -1205,7 +1205,7 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
>      kroute.u.msi.address_lo = (uint32_t)msg.address;
>      kroute.u.msi.address_hi = msg.address >> 32;
>      kroute.u.msi.data = le32_to_cpu(msg.data);
> -    if (pci_available && kvm_msi_devid_required()) {
> +    if (pci_available && dev && kvm_msi_devid_required()) {
>          kroute.flags = KVM_MSI_VALID_DEVID;
>          kroute.u.msi.devid = pci_requester_id(dev);
>      }
> -- 
> 2.14.3
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] kvm: check dev parameter when updating msi route
  2018-02-02 19:35   ` [Qemu-devel] " Radim Krčmář
@ 2018-02-05  6:17     ` P J P
  -1 siblings, 0 replies; 5+ messages in thread
From: P J P @ 2018-02-05  6:17 UTC (permalink / raw)
  To: Radim Krčmář; +Cc: kvm, Paolo Bonzini, Guoxiang Niu, qemu-devel

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

  Hello Radim,

+-- On Fri, 2 Feb 2018, Radim Krčmář wrote --+
| This should primarily go to the qemu devel list.  I've Cc'd it, but
| reposting would be safer, thanks.

  Ah, Okay. I did think qemu-devel would be better, but MAINTAINERS file lists 
kvm@vger.kernel.org address for accel/kvm/.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PATCH] kvm: check dev parameter when updating msi route
@ 2018-02-05  6:17     ` P J P
  0 siblings, 0 replies; 5+ messages in thread
From: P J P @ 2018-02-05  6:17 UTC (permalink / raw)
  To: Radim Krčmář; +Cc: kvm, Paolo Bonzini, Guoxiang Niu, qemu-devel

  Hello Radim,

+-- On Fri, 2 Feb 2018, Radim Krčmář wrote --+
| This should primarily go to the qemu devel list.  I've Cc'd it, but
| reposting would be safer, thanks.

  Ah, Okay. I did think qemu-devel would be better, but MAINTAINERS file lists 
kvm@vger.kernel.org address for accel/kvm/.

Thank you.
--
Prasad J Pandit / Red Hat Product Security Team
47AF CE69 3A90 54AA 9045 1053 DD13 3D32 FE5B 041F

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-02-05  6:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-02  4:51 [PATCH] kvm: check dev parameter when updating msi route P J P
2018-02-02 19:35 ` Radim Krčmář
2018-02-02 19:35   ` [Qemu-devel] " Radim Krčmář
2018-02-05  6:17   ` P J P
2018-02-05  6:17     ` [Qemu-devel] " P J P

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.