From: Frediano Ziglio <fziglio@redhat.com>
To: fziglio@redhat.com, spice-devel@lists.freedesktop.org,
airlied@linux.ie, dri-devel@lists.freedesktop.org,
airlied@redhat.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 07/11] Handle correctly failures in qxl_alloc_relase_reserved
Date: Wed, 27 May 2015 11:04:02 +0100 [thread overview]
Message-ID: <1432721046-4418-8-git-send-email-fziglio@redhat.com> (raw)
In-Reply-To: <1432721046-4418-1-git-send-email-fziglio@redhat.com>
Free resources correctly if function fails
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
qxl/qxl_release.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/qxl/qxl_release.c b/qxl/qxl_release.c
index 6fd8e50..00604ed 100644
--- a/qxl/qxl_release.c
+++ b/qxl/qxl_release.c
@@ -363,6 +363,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
ret = qxl_release_bo_alloc(qdev, &qdev->current_release_bo[cur_idx]);
if (ret) {
mutex_unlock(&qdev->release_mutex);
+ qxl_release_free(qdev, *release);
return ret;
}
}
@@ -377,13 +378,17 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
mutex_unlock(&qdev->release_mutex);
- qxl_release_list_add(*release, bo);
+ ret = qxl_release_list_add(*release, bo);
+ qxl_bo_unref(&bo);
+ if (ret) {
+ qxl_release_free(qdev, *release);
+ return ret;
+ }
info = qxl_release_map(qdev, *release);
info->id = idr_ret;
qxl_release_unmap(qdev, *release, info);
- qxl_bo_unref(&bo);
return ret;
}
--
2.1.0
next prev parent reply other threads:[~2015-05-27 10:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-27 10:03 [PATCH 00/11] Miscellaneous stability patches Frediano Ziglio
2015-05-27 10:03 ` [PATCH 01/11] Do not cause spice-server to clean our objects Frediano Ziglio
2015-05-28 3:08 ` [Spice-devel] " Dave Airlie
2015-05-27 10:03 ` [PATCH 02/11] Do not leak memory if qxl_release_list_add fails Frediano Ziglio
2015-05-28 3:09 ` [Spice-devel] " Dave Airlie
2015-05-27 10:03 ` [PATCH 03/11] Fix print statement not using uninitialized variable Frediano Ziglio
2015-05-28 3:10 ` [Spice-devel] " Dave Airlie
2015-05-27 10:03 ` [PATCH 04/11] Avoid double free on error Frediano Ziglio
2015-05-28 3:11 ` [Spice-devel] " Dave Airlie
2015-05-27 10:04 ` [PATCH 05/11] Handle all errors in qxl_surface_evict Frediano Ziglio
2015-05-28 3:16 ` [Spice-devel] " Dave Airlie
2015-05-27 10:04 ` [PATCH 06/11] Fix return for qxl_release_alloc Frediano Ziglio
2015-05-28 3:17 ` [Spice-devel] " Dave Airlie
2015-05-27 10:04 ` Frediano Ziglio [this message]
2015-05-28 3:20 ` [Spice-devel] [PATCH 07/11] Handle correctly failures in qxl_alloc_relase_reserved Dave Airlie
2015-05-27 10:04 ` [PATCH 08/11] Remove format string errors Frediano Ziglio
2015-05-28 3:20 ` [Spice-devel] " Dave Airlie
2015-05-27 10:04 ` [PATCH 09/11] Move main reference counter to GEM object instead of TTM ones Frediano Ziglio
2015-05-28 3:31 ` [Spice-devel] " Dave Airlie
2015-05-29 11:11 ` Frediano Ziglio
2015-05-27 10:04 ` [PATCH 10/11] Simplify cleaning qxl processing command Frediano Ziglio
2015-05-28 3:32 ` [Spice-devel] " Dave Airlie
2015-05-27 10:04 ` [PATCH 11/11] Propagate correctly errors from qxlhw_handle_to_bo Frediano Ziglio
2015-05-28 3:33 ` [Spice-devel] " Dave Airlie
2015-05-27 12:47 ` [PATCH 00/11] Miscellaneous stability patches Josh Boyer
2015-05-27 12:49 ` Josh Boyer
2015-05-27 13:28 ` Frediano Ziglio
2015-05-28 3:07 ` [Spice-devel] " Dave Airlie
2015-05-28 14:10 ` Frediano Ziglio
2015-05-29 5:48 ` Frans Klaver
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=1432721046-4418-8-git-send-email-fziglio@redhat.com \
--to=fziglio@redhat.com \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=spice-devel@lists.freedesktop.org \
/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;
as well as URLs for NNTP newsgroup(s).