linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: torvalds@osdl.org, akpm@osdl.org, steved@redhat.com,
	trond.myklebust@fys.uio.no, aviro@redhat.com
Cc: linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com,
	nfsv4@linux-nfs.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] 9p: Fix error handling on superblock alloc failure [try #7]
Date: Wed, 08 Mar 2006 20:30:21 +0000	[thread overview]
Message-ID: <20060308203021.25493.85005.stgit@warthog.cambridge.redhat.com> (raw)
In-Reply-To: <20060308203018.25493.23720.stgit@warthog.cambridge.redhat.com>

The attached patch adds error handling and cleanup in the case that sget()
fails, lest a memory leak occur.

Signed-Off-By: David Howells <dhowells@redhat.com>
---

 fs/9p/vfs_super.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index bca1efb..17dee27 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -134,8 +134,11 @@ static int v9fs_get_sb(struct file_syste
 	}
 
 	sb = sget(fs_type, NULL, v9fs_set_super, v9ses);
-	if (IS_ERR(sb))
+	if (IS_ERR(sb)) {
+		v9fs_session_close(v9ses);
+		kfree(v9ses);
 		return PTR_ERR(sb);
+	}
 
 	v9fs_fill_super(sb, v9ses, flags);
 

  reply	other threads:[~2006-03-08 20:30 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-08 20:30 [PATCH 1/6] NFS: Permit filesystem to override root dentry on mount [try #7] David Howells
2006-03-08 20:30 ` David Howells [this message]
2006-03-08 21:28   ` [PATCH 2/6] 9p: Fix error handling on superblock alloc failure " Christoph Hellwig
2006-03-08 20:30 ` [PATCH 3/6] NFS: Abstract out namespace initialisation " David Howells
2006-03-08 20:32   ` Christoph Hellwig
2006-03-08 20:30 ` [PATCH 4/6] NFS: Add dentry materialisation op " David Howells
2006-03-08 21:31   ` Christoph Hellwig
2006-03-08 20:30 ` [PATCH 5/6] NFS: Unify NFS superblocks per-protocol per-server " David Howells
2006-03-08 21:23   ` Christoph Hellwig
2006-03-08 22:48   ` Trond Myklebust
2006-03-09 11:27   ` David Howells
2006-03-08 20:30 ` [PATCH 6/6] Optimise d_find_alias() " David Howells
2006-03-08 21:14 ` [PATCH] NFS: Make namespace initialisation out of line David Howells
2006-03-08 21:25 ` [PATCH 1/6] NFS: Permit filesystem to override root dentry on mount [try #7] Christoph Hellwig

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=20060308203021.25493.85005.stgit@warthog.cambridge.redhat.com \
    --to=dhowells@redhat.com \
    --cc=akpm@osdl.org \
    --cc=aviro@redhat.com \
    --cc=linux-cachefs@redhat.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nfsv4@linux-nfs.org \
    --cc=steved@redhat.com \
    --cc=torvalds@osdl.org \
    --cc=trond.myklebust@fys.uio.no \
    /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).