virt: acrn: fix a memory leak in acrn_dev_ioctl()
authorXiaolong Huang <butterflyhuangxx@gmail.com>
Tue, 8 Mar 2022 09:20:47 +0000 (17:20 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:23:50 +0000 (14:23 +0200)
[ Upstream commit ecd1735f14d6ac868ae5d8b7a2bf193fa11f388b ]

The vm_param and cpu_regs need to be freed via kfree()
before return -EINVAL error.

Fixes: 9c5137aedd11 ("virt: acrn: Introduce VM management interfaces")
Fixes: 2ad2aaee1bc9 ("virt: acrn: Introduce an ioctl to set vCPU registers state")
Signed-off-by: Xiaolong Huang <butterflyhuangxx@gmail.com>
Signed-off-by: Fei Li <fei1.li@intel.com>
Link: https://lore.kernel.org/r/20220308092047.1008409-1-butterflyhuangxx@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/virt/acrn/hsm.c

index 130e12b..af889ce 100644 (file)
@@ -134,8 +134,10 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
                if (IS_ERR(vm_param))
                        return PTR_ERR(vm_param);
 
-               if ((vm_param->reserved0 | vm_param->reserved1) != 0)
+               if ((vm_param->reserved0 | vm_param->reserved1) != 0) {
+                       kfree(vm_param);
                        return -EINVAL;
+               }
 
                vm = acrn_vm_create(vm, vm_param);
                if (!vm) {
@@ -180,21 +182,29 @@ static long acrn_dev_ioctl(struct file *filp, unsigned int cmd,
                        return PTR_ERR(cpu_regs);
 
                for (i = 0; i < ARRAY_SIZE(cpu_regs->reserved); i++)
-                       if (cpu_regs->reserved[i])
+                       if (cpu_regs->reserved[i]) {
+                               kfree(cpu_regs);
                                return -EINVAL;
+                       }
 
                for (i = 0; i < ARRAY_SIZE(cpu_regs->vcpu_regs.reserved_32); i++)
-                       if (cpu_regs->vcpu_regs.reserved_32[i])
+                       if (cpu_regs->vcpu_regs.reserved_32[i]) {
+                               kfree(cpu_regs);
                                return -EINVAL;
+                       }
 
                for (i = 0; i < ARRAY_SIZE(cpu_regs->vcpu_regs.reserved_64); i++)
-                       if (cpu_regs->vcpu_regs.reserved_64[i])
+                       if (cpu_regs->vcpu_regs.reserved_64[i]) {
+                               kfree(cpu_regs);
                                return -EINVAL;
+                       }
 
                for (i = 0; i < ARRAY_SIZE(cpu_regs->vcpu_regs.gdt.reserved); i++)
                        if (cpu_regs->vcpu_regs.gdt.reserved[i] |
-                           cpu_regs->vcpu_regs.idt.reserved[i])
+                           cpu_regs->vcpu_regs.idt.reserved[i]) {
+                               kfree(cpu_regs);
                                return -EINVAL;
+                       }
 
                ret = hcall_set_vcpu_regs(vm->vmid, virt_to_phys(cpu_regs));
                if (ret < 0)