| From 92e371af9879b2ed80cbf351e34e0f846c2dfa53 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 Feb 2020 03:47:53 +0000 |
| Subject: NFS: Fix memory leaks |
| |
| 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 94f98e190e632..526441de89c1d 100644 |
| --- a/fs/nfs/nfs42proc.c |
| +++ b/fs/nfs/nfs42proc.c |
| @@ -283,14 +283,14 @@ static ssize_t _nfs42_proc_copy(struct file *src, |
| status = handle_async_copy(res, server, src, dst, |
| &args->src_stateid); |
| 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 |
| |
