| From 6df200f5d5191bdde4d2e408215383890f956781 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Thu, 29 May 2014 20:06:55 -0400 |
| Subject: pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr() |
| |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| |
| 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> |
| |
| --- |
| fs/nfs/nfs4filelayout.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/nfs/nfs4filelayout.c |
| +++ b/fs/nfs/nfs4filelayout.c |
| @@ -1330,7 +1330,7 @@ filelayout_alloc_layout_hdr(struct inode |
| struct nfs4_filelayout *flo; |
| |
| flo = kzalloc(sizeof(*flo), gfp_flags); |
| - return &flo->generic_hdr; |
| + return flo != NULL ? &flo->generic_hdr : NULL; |
| } |
| |
| static void |
