]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: x86/xen: Simplify eventfd IOCTLs
authorMichal Luczaj <mhal@rbox.co>
Mon, 26 Dec 2022 12:03:18 +0000 (12:03 +0000)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 27 Dec 2022 11:01:49 +0000 (06:01 -0500)
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: Michal Luczaj <mhal@rbox.co>
Message-Id: <20221222203021.1944101-3-mhal@rbox.co>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20221226120320.1125390-4-dwmw2@infradead.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/xen.c

index 9b75457120f7d41b270869e9b58d2bd1fec73897..bddbe5ac5cfa2d23f7d9c6d5801a1c119d0fcdf7 100644 (file)
@@ -1810,9 +1810,6 @@ static int kvm_xen_eventfd_update(struct kvm *kvm,
        struct evtchnfd *evtchnfd;
        int ret;
 
-       if (!port || port >= max_evtchn_port(kvm))
-               return -EINVAL;
-
        /* Protect writes to evtchnfd as well as the idr lookup.  */
        mutex_lock(&kvm->lock);
        evtchnfd = idr_find(&kvm->arch.xen.evtchn_ports, port);
@@ -1858,12 +1855,9 @@ static int kvm_xen_eventfd_assign(struct kvm *kvm,
 {
        u32 port = data->u.evtchn.send_port;
        struct eventfd_ctx *eventfd = NULL;
-       struct evtchnfd *evtchnfd = NULL;
+       struct evtchnfd *evtchnfd;
        int ret = -EINVAL;
 
-       if (!port || port >= max_evtchn_port(kvm))
-               return -EINVAL;
-
        evtchnfd = kzalloc(sizeof(struct evtchnfd), GFP_KERNEL);
        if (!evtchnfd)
                return -ENOMEM;