From: Yi Wang <wang.yi59@zte.com.cn>
To: pbonzini@redhat.com
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
xue.zhihong@zte.com.cn, wang.yi59@zte.com.cn,
wang.liang82@zte.com.cn, ZhaoQiang <zhao.qiang11@zte.com.cn>
Subject: [PATCH] KVM: Fix OOM vulnerability caused by continuously creating devices
Date: Sun, 9 Jan 2022 00:49:48 +0800 [thread overview]
Message-ID: <20220108164948.42112-1-wang.yi59@zte.com.cn> (raw)
From: ZhaoQiang <zhao.qiang11@zte.com.cn>
When processing the ioctl request for creating a device in the
kvm_vm_ioctl()function,the branch did not reclaim the successfully
created device,which caused memory leak.
Signed-off-by: ZhaoQiang <zhao.qiang11@zte.com.cn>
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
---
virt/kvm/kvm_main.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 72c4e6b39389..f4fbc935faea 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -52,6 +52,7 @@
#include <linux/lockdep.h>
#include <linux/kthread.h>
#include <linux/suspend.h>
+#include <linux/syscalls.h>
#include <asm/processor.h>
#include <asm/ioctl.h>
@@ -4092,6 +4093,40 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
return 0;
}
+static int kvm_ioctl_destroy_device(struct kvm *kvm,
+ struct kvm_create_device *cd)
+{
+ struct kvm_device_ops *ops = NULL;
+ struct kvm_device *dev;
+ struct file *file;
+ int type;
+
+ if (cd->type >= ARRAY_SIZE(kvm_device_ops_table))
+ return -ENODEV;
+
+ type = array_index_nospec(cd->type, ARRAY_SIZE(kvm_device_ops_table));
+ ops = kvm_device_ops_table[type];
+ if (ops == NULL)
+ return -ENODEV;
+
+ file = fget(cd->fd);
+ if (!file)
+ return -ENODEV;
+
+ dev = file->private_data;
+ if (!dev)
+ return -ENODEV;
+
+ kvm_put_kvm(kvm);
+ mutex_lock(&kvm->lock);
+ list_del(&device->vm_node);
+ mutex_unlock(&kvm->lock);
+ ops->destroy(dev);
+ ksys_close(cd->fd);
+
+ return 0;
+}
+
static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
{
switch (arg) {
@@ -4448,8 +4483,10 @@ static long kvm_vm_ioctl(struct file *filp,
goto out;
r = -EFAULT;
- if (copy_to_user(argp, &cd, sizeof(cd)))
+ if (copy_to_user(argp, &cd, sizeof(cd))) {
+ kvm_ioctl_destroy_device(kvm, &cd);
goto out;
+ }
r = 0;
break;
--
2.27.0
next reply other threads:[~2022-01-08 9:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-08 16:49 Yi Wang [this message]
2022-01-10 16:12 ` Sean Christopherson
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=20220108164948.42112-1-wang.yi59@zte.com.cn \
--to=wang.yi59@zte.com.cn \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=wang.liang82@zte.com.cn \
--cc=xue.zhihong@zte.com.cn \
--cc=zhao.qiang11@zte.com.cn \
/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
all inboxes | Powered by JetHome®