projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c8e4702)
pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()
authorTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 30 May 2014 00:06:55 +0000 (20:06 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 30 May 2014 00:15:32 +0000 (20:15 -0400)
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>
fs/nfs/nfs4filelayout.c patch | blob | blame | history

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 63a16375660abd266333da85ccd87bd140301c76..21e921147d21b7b42253deb2621e208ba59c18af 100644 (file)
--- 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