Commit 1c14faa5 authored by Michal Luczaj's avatar Michal Luczaj Committed by Paolo Bonzini

KVM: x86/xen: Simplify eventfd IOCTLs

Port number is validated in kvm_xen_setattr_evtchn().
Remove superfluous checks in kvm_xen_eventfd_assign() and
kvm_xen_eventfd_update().
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Message-Id: <20221222203021.1944101-3-mhal@rbox.co>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20221226120320.1125390-4-dwmw2@infradead.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 70eae030
...@@ -1810,9 +1810,6 @@ static int kvm_xen_eventfd_update(struct kvm *kvm, ...@@ -1810,9 +1810,6 @@ static int kvm_xen_eventfd_update(struct kvm *kvm,
struct evtchnfd *evtchnfd; struct evtchnfd *evtchnfd;
int ret; int ret;
if (!port || port >= max_evtchn_port(kvm))
return -EINVAL;
/* Protect writes to evtchnfd as well as the idr lookup. */ /* Protect writes to evtchnfd as well as the idr lookup. */
mutex_lock(&kvm->lock); mutex_lock(&kvm->lock);
evtchnfd = idr_find(&kvm->arch.xen.evtchn_ports, port); evtchnfd = idr_find(&kvm->arch.xen.evtchn_ports, port);
...@@ -1858,12 +1855,9 @@ static int kvm_xen_eventfd_assign(struct kvm *kvm, ...@@ -1858,12 +1855,9 @@ static int kvm_xen_eventfd_assign(struct kvm *kvm,
{ {
u32 port = data->u.evtchn.send_port; u32 port = data->u.evtchn.send_port;
struct eventfd_ctx *eventfd = NULL; struct eventfd_ctx *eventfd = NULL;
struct evtchnfd *evtchnfd = NULL; struct evtchnfd *evtchnfd;
int ret = -EINVAL; int ret = -EINVAL;
if (!port || port >= max_evtchn_port(kvm))
return -EINVAL;
evtchnfd = kzalloc(sizeof(struct evtchnfd), GFP_KERNEL); evtchnfd = kzalloc(sizeof(struct evtchnfd), GFP_KERNEL);
if (!evtchnfd) if (!evtchnfd)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment