All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Haynes <thomas.haynes@primarydata.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>,
	Christoph Hellwig <hch@lst.de>
Subject: [PATCH 2/4] nfsd: Can leak pnfs_block_extent on error
Date: Tue, 24 May 2016 22:09:37 -0700	[thread overview]
Message-ID: <1464152979-103988-3-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1464152979-103988-1-git-send-email-loghyr@primarydata.com>

Signed-off-by: Tom Haynes <loghyr@primarydata.com>
---
 fs/nfsd/blocklayout.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index 248adb6..9a195f1 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -23,7 +23,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
 	struct nfsd4_layout_seg *seg = &args->lg_seg;
 	struct super_block *sb = inode->i_sb;
 	u32 block_size = (1 << inode->i_blkbits);
-	struct pnfs_block_extent *bex;
+	struct pnfs_block_extent *bex = NULL;
 	struct iomap iomap;
 	u32 device_generation = 0;
 	int error;
@@ -105,9 +105,11 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
 	return 0;
 
 out_error:
+	kfree(bex);
 	seg->length = 0;
 	return nfserrno(error);
 out_layoutunavailable:
+	kfree(bex);
 	seg->length = 0;
 	return nfserr_layoutunavailable;
 }
-- 
1.8.3.1


  parent reply	other threads:[~2016-05-25  5:09 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-25  5:09 [PATCH 0/4] Super simple flex file server Tom Haynes
2016-05-25  5:09 ` [PATCH 1/4] nfsd: flex file device id encoding will need the server addres Tom Haynes
2016-05-25 11:49   ` Jeff Layton
2016-05-25 15:08   ` Christoph Hellwig
2016-05-25  5:09 ` Tom Haynes [this message]
2016-05-25 11:50   ` [PATCH 2/4] nfsd: Can leak pnfs_block_extent on error Jeff Layton
2016-05-25 15:07   ` Christoph Hellwig
2016-05-25 18:12     ` Thomas Haynes
2016-05-25 18:20       ` J. Bruce Fields
2016-05-25  5:09 ` [PATCH 3/4] nfsd: Add a super simple flex file server Tom Haynes
2016-05-25 12:00   ` Jeff Layton
2016-05-25 12:30   ` Jeff Layton
2016-05-25 14:41     ` Thomas Haynes
2016-05-25 17:42     ` J. Bruce Fields
2016-05-25 21:57       ` Jeff Layton
2016-05-26 13:18         ` J. Bruce Fields
2016-05-25 15:15   ` Christoph Hellwig
2016-05-26  5:37     ` Thomas Haynes
2016-05-25  5:09 ` [PATCH 4/4] nfsd: Provide a config option for flex file layouts Tom Haynes
2016-05-25 15:09   ` Christoph Hellwig
2016-05-25 18:19     ` Thomas Haynes
2016-05-25 18:21       ` J. Bruce Fields

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=1464152979-103988-3-git-send-email-loghyr@primarydata.com \
    --to=thomas.haynes@primarydata.com \
    --cc=bfields@fieldses.org \
    --cc=hch@lst.de \
    --cc=linux-nfs@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.