Commit 0a68b0be authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

sunrpc: fix leak on error on socket xprt setup 



Also collect exit code together while we're at it.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b1cdc467

net/sunrpc/xprtsock.c

+18 −11
Original line number Diff line number Diff line
@@ -2293,6 +2293,7 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args) 
	struct sockaddr *addr = args->dstaddr;

	struct rpc_xprt *xprt;

	struct sock_xprt *transport;

	struct rpc_xprt *ret;



	xprt = xs_setup_xprt(args, xprt_udp_slot_table_entries);

	if (IS_ERR(xprt))
@@ -2330,8 +2331,8 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args) 
		xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP6);

		break;

	default:

		kfree(xprt);

		return ERR_PTR(-EAFNOSUPPORT);

		ret = ERR_PTR(-EAFNOSUPPORT);

		goto out_err;

	}



	if (xprt_bound(xprt))
@@ -2346,10 +2347,11 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args) 


	if (try_module_get(THIS_MODULE))

		return xprt;



	ret = ERR_PTR(-EINVAL);

out_err:

	kfree(xprt->slot);

	kfree(xprt);

	return ERR_PTR(-EINVAL);

	return ret;

}



static const struct rpc_timeout xs_tcp_default_timeout = {
@@ -2368,6 +2370,7 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) 
	struct sockaddr *addr = args->dstaddr;

	struct rpc_xprt *xprt;

	struct sock_xprt *transport;

	struct rpc_xprt *ret;



	xprt = xs_setup_xprt(args, xprt_tcp_slot_table_entries);

	if (IS_ERR(xprt))
@@ -2403,8 +2406,8 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) 
		xs_format_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);

		break;

	default:

		kfree(xprt);

		return ERR_PTR(-EAFNOSUPPORT);

		ret = ERR_PTR(-EAFNOSUPPORT);

		goto out_err;

	}



	if (xprt_bound(xprt))
@@ -2420,10 +2423,11 @@ static struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) 


	if (try_module_get(THIS_MODULE))

		return xprt;



	ret = ERR_PTR(-EINVAL);

out_err:

	kfree(xprt->slot);

	kfree(xprt);

	return ERR_PTR(-EINVAL);

	return ret;

}



/**
@@ -2437,6 +2441,7 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args) 
	struct rpc_xprt *xprt;

	struct sock_xprt *transport;

	struct svc_sock *bc_sock;

	struct rpc_xprt *ret;



	xprt = xs_setup_xprt(args, xprt_tcp_slot_table_entries);

	if (IS_ERR(xprt))
@@ -2476,8 +2481,8 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args) 
				   RPCBIND_NETID_TCP6);

		break;

	default:

		kfree(xprt);

		return ERR_PTR(-EAFNOSUPPORT);

		ret = ERR_PTR(-EAFNOSUPPORT);

		goto out_err;

	}



	if (xprt_bound(xprt))
@@ -2499,9 +2504,11 @@ static struct rpc_xprt *xs_setup_bc_tcp(struct xprt_create *args) 


	if (try_module_get(THIS_MODULE))

		return xprt;

	ret = ERR_PTR(-EINVAL);

out_err:

	kfree(xprt->slot);

	kfree(xprt);

	return ERR_PTR(-EINVAL);

	return ret;

}



static struct xprt_class	xs_udp_transport = {