2022-03-01 11:53:29

by butt3rflyh4ck

Subject: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

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 <[email protected]>
---
drivers/virt/acrn/hsm.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
index 5419794fccf1..423ea888d79a 100644
--- a/drivers/virt/acrn/hsm.c
+++ b/drivers/virt/acrn/hsm.c
@@ -136,8 +136,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) {
@@ -182,21 +184,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)
--
2.25.1

2022-03-03 06:13:28

by Fei Li

Subject: Re: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

On Tue, Mar 01, 2022 at 06:00:59PM +0800, Xiaolong Huang wrote:
> 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 <[email protected]>
> ---
> drivers/virt/acrn/hsm.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
Hi Xiaolong

Thanks for helping to fix this issue.

This patch looks good. But I didn't see the base tree information of your patch applies to.
Would you please help to record it.

Thanks.

> diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> index 5419794fccf1..423ea888d79a 100644
> --- a/drivers/virt/acrn/hsm.c
> +++ b/drivers/virt/acrn/hsm.c
> @@ -136,8 +136,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) {
> @@ -182,21 +184,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)
> --
> 2.25.1
>

2022-03-08 10:12:26

by Greg KH

Subject: Re: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

On Tue, Mar 08, 2022 at 05:20:47PM +0800, Xiaolong Huang wrote:
> 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 <[email protected]>
> Signed-off-by: Fei Li <[email protected]>
> ---
> drivers/virt/acrn/hsm.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> index 5419794fccf1..423ea888d79a 100644
> --- a/drivers/virt/acrn/hsm.c
> +++ b/drivers/virt/acrn/hsm.c
> @@ -136,8 +136,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) {
> @@ -182,21 +184,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)
>
> base-commit: 5859a2b1991101d6b978f3feb5325dad39421f29
> --
> 2.25.1
>

How did you test this?

2022-03-08 11:44:21

by butt3rflyh4ck

Subject: Re: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

No, not yet. I just code audit.

Regards,
butt3rflyh4ck.

On Tue, Mar 8, 2022 at 5:56 PM Greg KH <[email protected]> wrote:
>
> On Tue, Mar 08, 2022 at 05:20:47PM +0800, Xiaolong Huang wrote:
> > 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 <[email protected]>
> > Signed-off-by: Fei Li <[email protected]>
> > ---
> > drivers/virt/acrn/hsm.c | 20 +++++++++++++++-----
> > 1 file changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> > index 5419794fccf1..423ea888d79a 100644
> > --- a/drivers/virt/acrn/hsm.c
> > +++ b/drivers/virt/acrn/hsm.c
> > @@ -136,8 +136,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) {
> > @@ -182,21 +184,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)
> >
> > base-commit: 5859a2b1991101d6b978f3feb5325dad39421f29
> > --
> > 2.25.1
> >
>
> How did you test this?



--
Active Defense Lab of Venustech

2022-03-09 01:04:21

by Greg KH

Subject: Re: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

On Tue, Mar 08, 2022 at 06:14:31PM +0800, butt3rflyh4ck wrote:
> No, not yet. I just code audit.

Please test things like this so that we know it actually is correct.

thanks,

greg k-h

2022-03-16 15:07:15

by butt3rflyh4ck

Subject: Re: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

Hi, Greg, could you tell me how to test (like this)?

Thank you,

butt3rflyh4ck.

On Tue, Mar 8, 2022 at 6:16 PM Greg KH <[email protected]> wrote:
>
> On Tue, Mar 08, 2022 at 06:14:31PM +0800, butt3rflyh4ck wrote:
> > No, not yet. I just code audit.
>
> Please test things like this so that we know it actually is correct.
>
> thanks,
>
> greg k-h



--
Active Defense Lab of Venustech

2022-03-17 06:26:42

by butt3rflyh4ck

Subject: Re: [PATCH] virt: acrn: fix a memory leak in acrn_dev_ioctl()

On Tue, Mar 8, 2022 at 5:56 PM Greg KH <[email protected]> wrote:
>
> On Tue, Mar 08, 2022 at 05:20:47PM +0800, Xiaolong Huang wrote:
> > 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 <[email protected]>
> > Signed-off-by: Fei Li <[email protected]>
> > ---
> > drivers/virt/acrn/hsm.c | 20 +++++++++++++++-----
> > 1 file changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/virt/acrn/hsm.c b/drivers/virt/acrn/hsm.c
> > index 5419794fccf1..423ea888d79a 100644
> > --- a/drivers/virt/acrn/hsm.c
> > +++ b/drivers/virt/acrn/hsm.c
> > @@ -136,8 +136,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) {
> > @@ -182,21 +184,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)
> >
> > base-commit: 5859a2b1991101d6b978f3feb5325dad39421f29
> > --
> > 2.25.1
> >
>
> How did you test this?

Ok, thanks. Firstly there is just some
parameter that should be freed before func returns the -EINVAL error
in the patch. I think it was correct, no need to test it. And
secondly the commitor
Li Fei1 also reviewed the patch code. finally I am sorry that no arcn
hso hardware to test it.

Regards,
butt3rflyh4ck.

--
Active Defense Lab of Venustech