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: stable@kernel.org
Fixes: 29cd2927fb91 ("SUNRPC: Fix encoding of accepted but unsuccessful RPC replies")
Reported-by: tianshuo han <hantianshuo233@gmail.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index ef8a05aac87ff1bfbc97807309cdfcc9281810bf..9c93b854e809ed1a833846c1c4751b861879af32 100644 (file)
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1371,7 +1371,8 @@ svc_process_common(struct svc_rqst *rqstp)
        case SVC_OK:
                break;
        case SVC_GARBAGE:
-               goto err_garbage_args;
+               rqstp->rq_auth_stat = rpc_autherr_badcred;
+               goto err_bad_auth;
        case SVC_SYSERR:
                goto err_system_err;
        case SVC_DENIED:
@@ -1512,14 +1513,6 @@ err_bad_proc:
        *rqstp->rq_accept_statp = rpc_proc_unavail;
        goto sendit;
 
-err_garbage_args:
-       svc_printk(rqstp, "failed to decode RPC header\n");
-
-       if (serv->sv_stats)
-               serv->sv_stats->rpcbadfmt++;
-       *rqstp->rq_accept_statp = rpc_garbage_args;
-       goto sendit;
-
 err_system_err:
        if (serv->sv_stats)
                serv->sv_stats->rpcbadfmt++;