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

Commit a00275ba authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

SUNRPC: Make AUTH_SYS and AUTH_NULL set au_verfsize 



au_verfsize will be needed for a non-flavor-specific computation
in a subsequent patch.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 02ef04e4

include/linux/sunrpc/auth.h

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ struct rpc_auth { 
				/* guess at number of u32's auth adds before

				 * reply data; normally the verifier size: */

	unsigned int		au_rslack;

				/* for gss, used to calculate au_rslack: */

	unsigned int		au_verfsize;

	unsigned int		au_verfsize;	/* size of reply verifier */



	unsigned int		au_flags;	/* various flags */

	const struct rpc_authops *au_ops;		/* operations */

net/sunrpc/auth_gss/auth_gss.c

+1 −0
Original line number Diff line number Diff line
@@ -1016,6 +1016,7 @@ gss_create_new(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt) 
	auth = &gss_auth->rpc_auth;

	auth->au_cslack = GSS_CRED_SLACK >> 2;

	auth->au_rslack = GSS_VERF_SLACK >> 2;

	auth->au_verfsize = GSS_VERF_SLACK >> 2;

	auth->au_flags = 0;

	auth->au_ops = &authgss_ops;

	auth->au_flavor = flavor;

net/sunrpc/auth_null.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static 
struct rpc_auth null_auth = {

	.au_cslack	= NUL_CALLSLACK,

	.au_rslack	= NUL_REPLYSLACK,

	.au_verfsize	= NUL_REPLYSLACK,

	.au_ops		= &authnull_ops,

	.au_flavor	= RPC_AUTH_NULL,

	.au_count	= REFCOUNT_INIT(1),

net/sunrpc/auth_unix.c

+4 −1
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ unx_refresh(struct rpc_task *task) 
static int

unx_validate(struct rpc_task *task, struct xdr_stream *xdr)

{

	struct rpc_auth *auth = task->tk_rqstp->rq_cred->cr_auth;

	__be32 *p;

	u32 size;
@@ -184,7 +185,8 @@ unx_validate(struct rpc_task *task, struct xdr_stream *xdr) 
	if (!p)

		return -EIO;



	task->tk_rqstp->rq_cred->cr_auth->au_rslack = (size >> 2) + 2;

	auth->au_verfsize = XDR_QUADLEN(size) + 2;

	auth->au_rslack = XDR_QUADLEN(size) + 2;

	return 0;

}
@@ -212,6 +214,7 @@ static 
struct rpc_auth		unix_auth = {

	.au_cslack	= UNX_CALLSLACK,

	.au_rslack	= NUL_REPLYSLACK,

	.au_verfsize	= NUL_REPLYSLACK,

	.au_ops		= &authunix_ops,

	.au_flavor	= RPC_AUTH_UNIX,

	.au_count	= REFCOUNT_INIT(1),