linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zach Brown <zab@redhat.com>
To: linux-btrfs@vger.kernel.org, Eric Sandeen <sandeen@redhat.com>
Subject: [PATCH 08/12] btrfs-progs: don't leak path in verify_space_cache
Date: Mon,  7 Oct 2013 14:43:01 -0700	[thread overview]
Message-ID: <1381182185-10896-9-git-send-email-zab@redhat.com> (raw)
In-Reply-To: <1381182185-10896-1-git-send-email-zab@redhat.com>

This was found by static analysis.

Signed-off-by: Zach Brown <zab@redhat.com>
---
 cmds-check.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmds-check.c b/cmds-check.c
index ebba58e..b6035d7 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -3228,13 +3228,13 @@ static int verify_space_cache(struct btrfs_root *root,
 
 	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
 	if (ret < 0)
-		return ret;
+		goto out;
 	ret = 0;
 	while (1) {
 		if (path->slots[0] >= btrfs_header_nritems(path->nodes[0])) {
 			ret = btrfs_next_leaf(root, path);
 			if (ret < 0)
-				return ret;
+				goto out;
 			if (ret > 0) {
 				ret = 0;
 				break;
@@ -3274,6 +3274,8 @@ static int verify_space_cache(struct btrfs_root *root,
 		ret = check_cache_range(root, cache, last,
 					cache->key.objectid +
 					cache->key.offset - last);
+
+out:
 	btrfs_free_path(path);
 
 	if (!ret &&
-- 
1.7.11.7


  parent reply	other threads:[~2013-10-07 21:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-07 21:42 [RFC] another round of static analysis fixes Zach Brown
2013-10-07 21:42 ` [PATCH 01/12] btrfs-progs: check path alloc in corrupt block Zach Brown
2013-10-07 21:42 ` [PATCH 02/12] btrfs-progs: check fopen failure in cmds-send Zach Brown
2013-10-08  8:41   ` Stefan Behrens
2013-10-08 16:44     ` Zach Brown
2013-10-08 17:19     ` Zach Brown
2013-10-07 21:42 ` [PATCH 03/12] btrfs-progs: don't overrun name in find-collisions Zach Brown
2013-10-07 21:42 ` [PATCH 04/12] btrfs-progs: don't overflow read buffer in image Zach Brown
2013-10-07 21:42 ` [PATCH 05/12] btrfs-progs: check link_subvol name base Zach Brown
2013-10-07 21:42 ` [PATCH 06/12] btrfs-progs: remove dead block group checking Zach Brown
2013-10-07 21:43 ` [PATCH 07/12] btrfs-progs: free eb in fixup_chunk_tree_block() Zach Brown
2013-10-07 21:43 ` Zach Brown [this message]
2013-10-08  5:18   ` [PATCH 08/12] btrfs-progs: don't leak path in verify_space_cache chandan
2013-10-07 21:43 ` [PATCH 09/12] btrfs-progs: don't deref pipefd[-1] Zach Brown
2013-10-07 21:45   ` Eric Sandeen
2013-10-07 21:47     ` Zach Brown
2013-10-07 21:43 ` [PATCH 10/12] btrfs-progs: don't overflow colors[] in fragments Zach Brown
2013-10-07 21:43 ` [PATCH 11/12] btrfs-progs: remove unused variables Zach Brown
2013-10-07 21:43 ` [PATCH 12/12] btrfs-progs: free leaked roots in calc-size Zach Brown
2013-10-08 16:38 ` [RFC] another round of static analysis fixes David Sterba
2013-10-08 17:20   ` Zach Brown

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=1381182185-10896-9-git-send-email-zab@redhat.com \
    --to=zab@redhat.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=sandeen@redhat.com \
    /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).