Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe9a6d5 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

NFSv4: fix server_scope memory leak 



server_scope would never be freed if nfs4_check_cl_exchange_flags() returned
non-zero

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent f86f36a6

fs/nfs/nfs4proc.c

+9 −6
Original line number Diff line number Diff line
@@ -4883,8 +4883,10 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred) 
				clp->cl_rpcclient->cl_auth->au_flavor);



	res.server_scope = kzalloc(sizeof(struct server_scope), GFP_KERNEL);

	if (unlikely(!res.server_scope))

		return -ENOMEM;

	if (unlikely(!res.server_scope)) {

		status = -ENOMEM;

		goto out;

	}



	status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);

	if (!status)
@@ -4901,12 +4903,13 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred) 
			clp->server_scope = NULL;

		}



		if (!clp->server_scope)

		if (!clp->server_scope) {

			clp->server_scope = res.server_scope;

		else

			kfree(res.server_scope);

			goto out;

		}



	}

	kfree(res.server_scope);

out:

	dprintk("<-- %s status= %d\n", __func__, status);

	return status;

}