lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 531/542] NFS: Fix memory leaks
    Date
    From: Wenwen Wang <wenwen@cs.uga.edu>

    [ Upstream commit 123c23c6a7b7ecd2a3d6060bea1d94019f71fd66 ]

    In _nfs42_proc_copy(), 'res->commit_res.verf' is allocated through
    kzalloc() if 'args->sync' is true. In the following code, if
    'res->synchronous' is false, handle_async_copy() will be invoked. If an
    error occurs during the invocation, the following code will not be executed
    and the error will be returned . However, the allocated
    'res->commit_res.verf' is not deallocated, leading to a memory leak. This
    is also true if the invocation of process_copy_commit() returns an error.

    To fix the above leaks, redirect the execution to the 'out' label if an
    error is encountered.

    Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/nfs42proc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
    index 9637aad36bdca..e2ae54b35dfe1 100644
    --- a/fs/nfs/nfs42proc.c
    +++ b/fs/nfs/nfs42proc.c
    @@ -343,14 +343,14 @@ static ssize_t _nfs42_proc_copy(struct file *src,
    status = handle_async_copy(res, dst_server, src_server, src,
    dst, &args->src_stateid, restart);
    if (status)
    - return status;
    + goto out;
    }

    if ((!res->synchronous || !args->sync) &&
    res->write_res.verifier.committed != NFS_FILE_SYNC) {
    status = process_copy_commit(dst, pos_dst, res);
    if (status)
    - return status;
    + goto out;
    }

    truncate_pagecache_range(dst_inode, pos_dst,
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 17:02    [W:4.058 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site