ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Hoist init_decode out of svc_authenticate()

Browse Source 
Now that each ->accept method has been converted to use xdr_stream,
the svcxdr_init_decode() calls can be hoisted back up into the
generic RPC server code.

The dprintk in svc_authenticate() is removed, since
trace_svc_authenticate() reports the same information.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever
2023-01-02 12:07:32 -05:00
parent b0bc53470d
commit 6898b47a0f
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/sunrpc/auth_gss/svcauth_gss.c
View File

@@ -1619,8 +1619,6 @@ svcauth_gss_accept(struct svc_rqst *rqstp)
int ret; int ret;
struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id); struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);
svcxdr_init_decode(rqstp);
rqstp->rq_auth_stat = rpc_autherr_badcred; rqstp->rq_auth_stat = rpc_autherr_badcred;
if (!svcdata) if (!svcdata)
svcdata = kmalloc(sizeof(*svcdata), GFP_KERNEL); svcdata = kmalloc(sizeof(*svcdata), GFP_KERNEL);

1
net/sunrpc/svc.c
View File

@@ -1276,6 +1276,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
* We do this before anything else in order to get a decent * We do this before anything else in order to get a decent
* auth verifier. * auth verifier.
*/ */
svcxdr_init_decode(rqstp);
auth_res = svc_authenticate(rqstp); auth_res = svc_authenticate(rqstp);
/* Also give the program a chance to reject this call: */ /* Also give the program a chance to reject this call: */
if (auth_res == SVC_OK && progp) if (auth_res == SVC_OK && progp)

13
net/sunrpc/svcauth.c
View File

@@ -63,14 +63,17 @@ svc_put_auth_ops(struct auth_ops *aops)
int int
svc_authenticate(struct svc_rqst *rqstp) svc_authenticate(struct svc_rqst *rqstp)
{ {
rpc_authflavor_t flavor; struct auth_ops *aops;
struct auth_ops *aops; u32 flavor;
rqstp->rq_auth_stat = rpc_auth_ok; rqstp->rq_auth_stat = rpc_auth_ok;
flavor = svc_getnl(&rqstp->rq_arg.head[0]); /*
* Decode the Call credential's flavor field. The credential's
dprintk("svc: svc_authenticate (%d)\n", flavor); * body field is decoded in the chosen ->accept method below.
*/
if (xdr_stream_decode_u32(&rqstp->rq_arg_stream, &flavor) < 0)
return SVC_GARBAGE;
aops = svc_get_auth_ops(flavor); aops = svc_get_auth_ops(flavor);
if (aops == NULL) { if (aops == NULL) {

6
net/sunrpc/svcauth_unix.c
View File

@@ -750,8 +750,6 @@ svcauth_null_accept(struct svc_rqst *rqstp)
u32 flavor, len; u32 flavor, len;
void *body; void *body;
svcxdr_init_decode(rqstp);
/* Length of Call's credential body field: */ /* Length of Call's credential body field: */
if (xdr_stream_decode_u32(xdr, &len) < 0) if (xdr_stream_decode_u32(xdr, &len) < 0)
return SVC_GARBAGE; return SVC_GARBAGE;
@@ -828,8 +826,6 @@ svcauth_tls_accept(struct svc_rqst *rqstp)
u32 flavor, len; u32 flavor, len;
void *body; void *body;
svcxdr_init_decode(rqstp);
/* Length of Call's credential body field: */ /* Length of Call's credential body field: */
if (xdr_stream_decode_u32(xdr, &len) < 0) if (xdr_stream_decode_u32(xdr, &len) < 0)
return SVC_GARBAGE; return SVC_GARBAGE;
@@ -905,8 +901,6 @@ svcauth_unix_accept(struct svc_rqst *rqstp)
void *body; void *body;
__be32 *p; __be32 *p;
svcxdr_init_decode(rqstp);
/* /*
* This implementation ignores the length of the Call's * This implementation ignores the length of the Call's
* credential body field and the timestamp and machinename * credential body field and the timestamp and machinename