Skip to content

Commit 94d10a4

Browse files
jtlaytonchucklever
authored andcommitted
sunrpc: handle SVC_GARBAGE during svc auth processing as auth error
tianshuo han reported a remotely-triggerable crash if the client sends a kernel RPC server a specially crafted packet. If decoding the RPC reply fails in such a way that SVC_GARBAGE is returned without setting the rq_accept_statp pointer, then that pointer can be dereferenced and a value stored there. If it's the first time the thread has processed an RPC, then that pointer will be set to NULL and the kernel will crash. In other cases, it could create a memory scribble. The server sunrpc code treats a SVC_GARBAGE return from svc_authenticate or pg_authenticate as if it should send a GARBAGE_ARGS reply. RFC 5531 says that if authentication fails that the RPC should be rejected instead with a status of AUTH_ERR. Handle a SVC_GARBAGE return as an AUTH_ERROR, with a reason of AUTH_BADCRED instead of returning GARBAGE_ARGS in that case. This sidesteps the whole problem of touching the rpc_accept_statp pointer in this situation and avoids the crash. Cc: [email protected] Fixes: 29cd292 ("SUNRPC: Fix encoding of accepted but unsuccessful RPC replies") Reported-by: tianshuo han <[email protected]> Reviewed-by: Chuck Lever <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 8ea688a commit 94d10a4

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

net/sunrpc/svc.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,8 @@ svc_process_common(struct svc_rqst *rqstp)
13711371
case SVC_OK:
13721372
break;
13731373
case SVC_GARBAGE:
1374-
goto err_garbage_args;
1374+
rqstp->rq_auth_stat = rpc_autherr_badcred;
1375+
goto err_bad_auth;
13751376
case SVC_SYSERR:
13761377
goto err_system_err;
13771378
case SVC_DENIED:
@@ -1512,14 +1513,6 @@ svc_process_common(struct svc_rqst *rqstp)
15121513
*rqstp->rq_accept_statp = rpc_proc_unavail;
15131514
goto sendit;
15141515

1515-
err_garbage_args:
1516-
svc_printk(rqstp, "failed to decode RPC header\n");
1517-
1518-
if (serv->sv_stats)
1519-
serv->sv_stats->rpcbadfmt++;
1520-
*rqstp->rq_accept_statp = rpc_garbage_args;
1521-
goto sendit;
1522-
15231516
err_system_err:
15241517
if (serv->sv_stats)
15251518
serv->sv_stats->rpcbadfmt++;

0 commit comments

Comments
 (0)