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

Commit 668ecd6b authored by Vasily Averin's avatar Vasily Averin Committed by Greg Kroah-Hartman
Browse files

sunrpc: use SVC_NET() in svcauth_gss_* functions 



commit b8be5674fa9a6f3677865ea93f7803c4212f3e10 upstream.

Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 807957ce

net/sunrpc/auth_gss/svcauth_gss.c

+4 −4
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ static int svcauth_gss_legacy_init(struct svc_rqst *rqstp, 
	struct kvec *resv = &rqstp->rq_res.head[0];

	struct rsi *rsip, rsikey;

	int ret;

	struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);

	struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);



	memset(&rsikey, 0, sizeof(rsikey));

	ret = gss_read_verf(gc, argv, authp,
@@ -1233,7 +1233,7 @@ static int svcauth_gss_proxy_init(struct svc_rqst *rqstp, 
	uint64_t handle;

	int status;

	int ret;

	struct net *net = rqstp->rq_xprt->xpt_net;

	struct net *net = SVC_NET(rqstp);

	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);



	memset(&ud, 0, sizeof(ud));
@@ -1424,7 +1424,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp) 
	__be32		*rpcstart;

	__be32		*reject_stat = resv->iov_base + resv->iov_len;

	int		ret;

	struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);

	struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);



	dprintk("RPC:       svcauth_gss: argv->iov_len = %zd\n",

			argv->iov_len);
@@ -1714,7 +1714,7 @@ svcauth_gss_release(struct svc_rqst *rqstp) 
	struct rpc_gss_wire_cred *gc = &gsd->clcred;

	struct xdr_buf *resbuf = &rqstp->rq_res;

	int stat = -EINVAL;

	struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);

	struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);



	if (gc->gc_proc != RPC_GSS_PROC_DATA)

		goto out;