* [PATCH] drm/i915/gvt: fix memory leak in intel_vgpu_ioctl()
@ 2018-08-03 0:41 Yi Wang
2018-08-03 1:27 ` Zhenyu Wang
2018-08-08 7:23 ` Zhenyu Wang
0 siblings, 2 replies; 3+ messages in thread
From: Yi Wang @ 2018-08-03 0:41 UTC (permalink / raw)
To: zhenyuw
Cc: zhi.a.wang, jani.nikula, joonas.lahtinen, rodrigo.vivi, airlied,
intel-gvt-dev, intel-gfx, dri-devel, linux-kernel, jiang.biao2,
wang.yi59, zhong.weidong
The 'sparse' variable may leak when return in function
intel_vgpu_ioctl(), and this patch fixes this.
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
---
drivers/gpu/drm/i915/gvt/kvmgt.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index df4e4a0..6a6f199 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -1200,6 +1200,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
return ret;
break;
default:
+ kfree(sparse);
return -EINVAL;
}
}
@@ -1215,6 +1216,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
sizeof(info), caps.buf,
caps.size)) {
kfree(caps.buf);
+ kfree(sparse);
return -EFAULT;
}
info.cap_offset = sizeof(info);
@@ -1223,6 +1225,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
kfree(caps.buf);
}
+ kfree(sparse);
return copy_to_user((void __user *)arg, &info, minsz) ?
-EFAULT : 0;
} else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/gvt: fix memory leak in intel_vgpu_ioctl()
2018-08-03 0:41 [PATCH] drm/i915/gvt: fix memory leak in intel_vgpu_ioctl() Yi Wang
@ 2018-08-03 1:27 ` Zhenyu Wang
2018-08-08 7:23 ` Zhenyu Wang
1 sibling, 0 replies; 3+ messages in thread
From: Zhenyu Wang @ 2018-08-03 1:27 UTC (permalink / raw)
To: Yi Wang
Cc: zhenyuw, zhi.a.wang, jani.nikula, joonas.lahtinen, rodrigo.vivi,
airlied, intel-gvt-dev, intel-gfx, dri-devel, linux-kernel,
jiang.biao2, zhong.weidong
[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]
On 2018.08.03 08:41:19 +0800, Yi Wang wrote:
> The 'sparse' variable may leak when return in function
> intel_vgpu_ioctl(), and this patch fixes this.
>
> Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
> Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
> ---
Looks fine to me, will queue this up.
Thanks for the patch!
> drivers/gpu/drm/i915/gvt/kvmgt.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index df4e4a0..6a6f199 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -1200,6 +1200,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
> return ret;
> break;
> default:
> + kfree(sparse);
> return -EINVAL;
> }
> }
> @@ -1215,6 +1216,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
> sizeof(info), caps.buf,
> caps.size)) {
> kfree(caps.buf);
> + kfree(sparse);
> return -EFAULT;
> }
> info.cap_offset = sizeof(info);
> @@ -1223,6 +1225,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
> kfree(caps.buf);
> }
>
> + kfree(sparse);
> return copy_to_user((void __user *)arg, &info, minsz) ?
> -EFAULT : 0;
> } else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
> --
> 1.8.3.1
>
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915/gvt: fix memory leak in intel_vgpu_ioctl()
2018-08-03 0:41 [PATCH] drm/i915/gvt: fix memory leak in intel_vgpu_ioctl() Yi Wang
2018-08-03 1:27 ` Zhenyu Wang
@ 2018-08-08 7:23 ` Zhenyu Wang
1 sibling, 0 replies; 3+ messages in thread
From: Zhenyu Wang @ 2018-08-08 7:23 UTC (permalink / raw)
To: Yi Wang
Cc: zhi.a.wang, jani.nikula, joonas.lahtinen, rodrigo.vivi, airlied,
intel-gvt-dev, intel-gfx, dri-devel, linux-kernel, jiang.biao2,
zhong.weidong
[-- Attachment #1: Type: text/plain, Size: 2667 bytes --]
On 2018.08.03 08:41:19 +0800, Yi Wang wrote:
> The 'sparse' variable may leak when return in function
> intel_vgpu_ioctl(), and this patch fixes this.
>
> Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
> Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
> ---
> drivers/gpu/drm/i915/gvt/kvmgt.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index df4e4a0..6a6f199 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -1200,6 +1200,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
> return ret;
> break;
> default:
> + kfree(sparse);
> return -EINVAL;
> }
> }
> @@ -1215,6 +1216,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
> sizeof(info), caps.buf,
> caps.size)) {
> kfree(caps.buf);
> + kfree(sparse);
> return -EFAULT;
> }
> info.cap_offset = sizeof(info);
> @@ -1223,6 +1225,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
> kfree(caps.buf);
> }
>
> + kfree(sparse);
Unfortunately this would cause a double-free error in normal path, as we
tried to free sparse after use to add caps. So may be better to fix free
in error path and move normal free of sparse in final point, e.g
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index 68df9aa88890..47b897b6ea93 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -1257,11 +1257,13 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
&sparse->header, sizeof(*sparse) +
(sparse->nr_areas *
sizeof(*sparse->areas)));
- kfree(sparse);
- if (ret)
+ if (ret) {
+ kfree(sparse);
return ret;
+ }
break;
default:
+ kfree(sparse);
return -EINVAL;
}
}
@@ -1277,6 +1279,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
sizeof(info), caps.buf,
caps.size)) {
kfree(caps.buf);
+ kfree(sparse);
return -EFAULT;
}
info.cap_offset = sizeof(info);
@@ -1285,6 +1288,7 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd,
kfree(caps.buf);
}
+ kfree(sparse);
return copy_to_user((void __user *)arg, &info, minsz) ?
-EFAULT : 0;
} else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
--
Open Source Technology Center, Intel ltd.
$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-08 7:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-03 0:41 [PATCH] drm/i915/gvt: fix memory leak in intel_vgpu_ioctl() Yi Wang
2018-08-03 1:27 ` Zhenyu Wang
2018-08-08 7:23 ` Zhenyu Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).