leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: Make AUTH_SYS and AUTH_NULL set au_verfsize

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

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Chuck Lever 2019-02-11 11:25:31 -05:00 committed by Anna Schumaker
parent 02ef04e432
commit a00275baa6
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/sunrpc/auth.h
View File

@ -77,8 +77,7 @@ struct rpc_auth {
/* guess at number of u32's auth adds before /* guess at number of u32's auth adds before
* reply data; normally the verifier size: */ * reply data; normally the verifier size: */
unsigned int au_rslack; unsigned int au_rslack;
/* for gss, used to calculate au_rslack: */ unsigned int au_verfsize; /* size of reply verifier */
unsigned int au_verfsize;
unsigned int au_flags; /* various flags */ unsigned int au_flags; /* various flags */
const struct rpc_authops *au_ops; /* operations */ const struct rpc_authops *au_ops; /* operations */

1
net/sunrpc/auth_gss/auth_gss.c
View File

@ -1016,6 +1016,7 @@ gss_create_new(const struct rpc_auth_create_args *args, struct rpc_clnt *clnt)
auth = &gss_auth->rpc_auth; auth = &gss_auth->rpc_auth;
auth->au_cslack = GSS_CRED_SLACK >> 2; auth->au_cslack = GSS_CRED_SLACK >> 2;
auth->au_rslack = GSS_VERF_SLACK >> 2; auth->au_rslack = GSS_VERF_SLACK >> 2;
auth->au_verfsize = GSS_VERF_SLACK >> 2;
auth->au_flags = 0; auth->au_flags = 0;
auth->au_ops = &authgss_ops; auth->au_ops = &authgss_ops;
auth->au_flavor = flavor; auth->au_flavor = flavor;

1
net/sunrpc/auth_null.c
View File

@ -114,6 +114,7 @@ static
struct rpc_auth null_auth = { struct rpc_auth null_auth = {
.au_cslack = NUL_CALLSLACK, .au_cslack = NUL_CALLSLACK,
.au_rslack = NUL_REPLYSLACK, .au_rslack = NUL_REPLYSLACK,
.au_verfsize = NUL_REPLYSLACK,
.au_ops = &authnull_ops, .au_ops = &authnull_ops,
.au_flavor = RPC_AUTH_NULL, .au_flavor = RPC_AUTH_NULL,
.au_count = REFCOUNT_INIT(1), .au_count = REFCOUNT_INIT(1),

5
net/sunrpc/auth_unix.c
View File

@ -163,6 +163,7 @@ unx_refresh(struct rpc_task *task)
static int static int
unx_validate(struct rpc_task *task, struct xdr_stream *xdr) unx_validate(struct rpc_task *task, struct xdr_stream *xdr)
{ {
struct rpc_auth *auth = task->tk_rqstp->rq_cred->cr_auth;
__be32 *p; __be32 *p;
u32 size; u32 size;
@ -184,7 +185,8 @@ unx_validate(struct rpc_task *task, struct xdr_stream *xdr)
if (!p) if (!p)
return -EIO; 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; return 0;
} }
@ -212,6 +214,7 @@ static
struct rpc_auth unix_auth = { struct rpc_auth unix_auth = {
.au_cslack = UNX_CALLSLACK, .au_cslack = UNX_CALLSLACK,
.au_rslack = NUL_REPLYSLACK, .au_rslack = NUL_REPLYSLACK,
.au_verfsize = NUL_REPLYSLACK,
.au_ops = &authunix_ops, .au_ops = &authunix_ops,
.au_flavor = RPC_AUTH_UNIX, .au_flavor = RPC_AUTH_UNIX,
.au_count = REFCOUNT_INIT(1), .au_count = REFCOUNT_INIT(1),