* [PATCH] intel: Don't leak the test page in an has_userptr() error path
@ 2014-09-17 12:37 Damien Lespiau
2014-09-19 13:31 ` Tvrtko Ursulin
0 siblings, 1 reply; 3+ messages in thread
From: Damien Lespiau @ 2014-09-17 12:37 UTC (permalink / raw)
To: intel-gfx, dri-devel
When handling the error on GEM_CLOSE, we weren't freeing the allocated
page. Plug that.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
intel/intel_bufmgr_gem.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index f378e5c..ce35bd4 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3383,9 +3383,8 @@ retry:
close_bo.handle = userptr.handle;
ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
- if (ret == 0) {
- free(ptr);
- } else {
+ free(ptr);
+ if (ret) {
fprintf(stderr, "Failed to release test userptr object! (%d) "
"i915 kernel driver may not be sane!\n", errno);
return false;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] intel: Don't leak the test page in an has_userptr() error path
2014-09-17 12:37 [PATCH] intel: Don't leak the test page in an has_userptr() error path Damien Lespiau
@ 2014-09-19 13:31 ` Tvrtko Ursulin
2014-09-19 13:37 ` Damien Lespiau
0 siblings, 1 reply; 3+ messages in thread
From: Tvrtko Ursulin @ 2014-09-19 13:31 UTC (permalink / raw)
To: Damien Lespiau, intel-gfx, dri-devel
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
On 09/17/2014 01:37 PM, Damien Lespiau wrote:
> When handling the error on GEM_CLOSE, we weren't freeing the allocated
> page. Plug that.
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
> intel/intel_bufmgr_gem.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
> index f378e5c..ce35bd4 100644
> --- a/intel/intel_bufmgr_gem.c
> +++ b/intel/intel_bufmgr_gem.c
> @@ -3383,9 +3383,8 @@ retry:
>
> close_bo.handle = userptr.handle;
> ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_GEM_CLOSE, &close_bo);
> - if (ret == 0) {
> - free(ptr);
> - } else {
> + free(ptr);
> + if (ret) {
> fprintf(stderr, "Failed to release test userptr object! (%d) "
> "i915 kernel driver may not be sane!\n", errno);
> return false;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] intel: Don't leak the test page in an has_userptr() error path
2014-09-19 13:31 ` Tvrtko Ursulin
@ 2014-09-19 13:37 ` Damien Lespiau
0 siblings, 0 replies; 3+ messages in thread
From: Damien Lespiau @ 2014-09-19 13:37 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx, dri-devel
On Fri, Sep 19, 2014 at 02:31:56PM +0100, Tvrtko Ursulin wrote:
>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
Thanks for the review, pushed the patch.
--
Damien
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-19 13:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-17 12:37 [PATCH] intel: Don't leak the test page in an has_userptr() error path Damien Lespiau
2014-09-19 13:31 ` Tvrtko Ursulin
2014-09-19 13:37 ` Damien Lespiau
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).