Skip to content

Commit c1e3b00

Browse files
sunrpc: handle SVC_GARBAGE during svc auth processing as auth error
jira VULN-71607 cve CVE-2025-38089 commit-author Jeff Layton <jlayton@kernel.org> commit 94d10a4 upstream-diff A merge conflict was caused because the following commit doesn't exit in our tree: ab42f4d ("sunrpc: don't change ->sv_stats if it doesn't exist") 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: 29cd292 ("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> (cherry picked from commit 94d10a4) Signed-off-by: Shreeya Patel <spatel@ciq.com> Signed-off-by: Shreeya Patel <spatel@ciq.com>
1 parent a7db97d commit c1e3b00

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

net/sunrpc/svc.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,7 +1343,8 @@ svc_process_common(struct svc_rqst *rqstp)
13431343
case SVC_OK:
13441344
break;
13451345
case SVC_GARBAGE:
1346-
goto err_garbage_args;
1346+
rqstp->rq_auth_stat = rpc_autherr_badcred;
1347+
goto err_bad_auth;
13471348
case SVC_SYSERR:
13481349
goto err_system_err;
13491350
case SVC_DENIED:
@@ -1478,13 +1479,6 @@ svc_process_common(struct svc_rqst *rqstp)
14781479
*rqstp->rq_accept_statp = rpc_proc_unavail;
14791480
goto sendit;
14801481

1481-
err_garbage_args:
1482-
svc_printk(rqstp, "failed to decode RPC header\n");
1483-
1484-
serv->sv_stats->rpcbadfmt++;
1485-
*rqstp->rq_accept_statp = rpc_garbage_args;
1486-
goto sendit;
1487-
14881482
err_system_err:
14891483
serv->sv_stats->rpcbadfmt++;
14901484
*rqstp->rq_accept_statp = rpc_system_err;

0 commit comments

Comments
 (0)