linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Black <daniel.black@au1.ibm.com>
To: linuxppc-dev@lists.ozlabs.org, pbonzini@redhat.com
Cc: Daniel Black <daniel.black@au1.ibm.com>,
	trivial@kernel.org, abdhalee@linux.vnet.ibm.com,
	sachinp@linux.vnet.ibm.com, jschoenh@amazon.de
Subject: [PATCH] KVM: KVM_MAX_IRQ_ROUTES only defined with CONFIG_HAVE_KVM_IRQ_ROUTING
Date: Wed, 20 Sep 2017 11:31:39 +1000	[thread overview]
Message-ID: <20170920013139.13329-1-daniel.black@au.ibm.com> (raw)
In-Reply-To: <1505579069.9665.22.camel@abdul.in.ibm.com>

Commit 36ae3c0a36b7 introduced code using KVM_MAX_IRQ_ROUTES. This
define isn't available on all platforms. As it is dependent on
CONFIG_HAVE_KVM_IRQ_ROUTING this define is used to enable the code
in 36ae3c0a36b7.

Fixes: 36ae3c0a36b7 ("KVM: Don't accept obviously wrong gsi values via KVM_IRQFD")
Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Suggested-by: Jan H. Schönherr <jschoenh@amazon.de>
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
---
 virt/kvm/eventfd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index c608ab4..75910dd 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -565,8 +565,10 @@ kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
 {
 	if (args->flags & ~(KVM_IRQFD_FLAG_DEASSIGN | KVM_IRQFD_FLAG_RESAMPLE))
 		return -EINVAL;
+#ifdef CONFIG_HAVE_KVM_IRQ_ROUTING
 	if (args->gsi >= KVM_MAX_IRQ_ROUTES)
 		return -EINVAL;
+#endif
 
 	if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)
 		return kvm_irqfd_deassign(kvm, args);
-- 
2.9.5

  parent reply	other threads:[~2017-09-20  1:32 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-16 16:24 [mainline][bisected 36ae3c0] Build fail at virt/kvm/eventfd.c:568 Abdul Haleem
2017-09-16 17:46 ` Jan H. Schönherr
2017-09-16 20:12   ` [PATCH] Revert "KVM: Don't accept obviously wrong gsi values via KVM_IRQFD" Jan H. Schönherr
2017-09-18  6:44     ` Michael Ellerman
2017-09-18  8:11       ` Paolo Bonzini
2017-09-18 12:21     ` David Hildenbrand
2017-09-20  1:31 ` Daniel Black [this message]
2017-09-20  5:05   ` [PATCH] KVM: KVM_MAX_IRQ_ROUTES only defined with CONFIG_HAVE_KVM_IRQ_ROUTING Daniel Black

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=20170920013139.13329-1-daniel.black@au.ibm.com \
    --to=daniel.black@au1.ibm.com \
    --cc=abdhalee@linux.vnet.ibm.com \
    --cc=jschoenh@amazon.de \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=pbonzini@redhat.com \
    --cc=sachinp@linux.vnet.ibm.com \
    --cc=trivial@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).