lkml.org 
[lkml]   [2014]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 075/198] pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr()
    Date
    3.11.10.13 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    fs/nfs/nfs4filelayout.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
    index 17ed87ef9de8..76a988f31727 100644
    --- a/fs/nfs/nfs4filelayout.c
    +++ b/fs/nfs/nfs4filelayout.c
    @@ -1301,7 +1301,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
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-03 12:41    [W:4.606 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site