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-Url: https://git.stricted.de/?a=commitdiff_plain;h=6df200f5d5191bdde4d2e408215383890f956781;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()

Return the NULL pointer when the allocation fails.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: <stable@vger.kernel.org> # 3.5.x
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 63a16375660a..21e921147d21 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -1348,7 +1348,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