From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 30 May 2014 00:06:55 +0000 (-0400)
Subject: pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()
X-Git-Tag: firefly_0821_release~3679^2~1927
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1631672d6cbf0d836a4eb3617a26add4281d4a3;p=firefly-linux-kernel-4.4.55.git

pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()

commit 6df200f5d5191bdde4d2e408215383890f956781 upstream.

Return the NULL pointer when the allocation fails.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 22d10623f5ee..b039f7f26d95 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -1300,7 +1300,7 @@ filelayout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags)
 	struct nfs4_filelayout *flo;
 
 	flo = kzalloc(sizeof(*flo), gfp_flags);
-	return &flo->generic_hdr;
+	return flo != NULL ? &flo->generic_hdr : NULL;
 }
 
 static void