Skip to content

Commit faf3a26

Browse files
sunrpc: handle SVC_GARBAGE during svc auth processing as auth error
jira VULN-71606 cve CVE-2025-38089 commit-author Jeff Layton <[email protected]> commit 94d10a4 upstream-diff The following commits cause merge conflicts since they are not present in the ciqlts9_2 branch: 6d037b1 ("SUNRPC: Remove the rpc_stat variable in svc_process_common()") ab42f4d ("sunrpc: don't change ->sv_stats if it doesn't exist") 649a692 ("SUNRPC: Convert RPC Reply header encoding to use xdr_stream") 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]> (cherry picked from commit 94d10a4) Signed-off-by: Shreeya Patel <[email protected]>
1 parent f539a2b commit faf3a26

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

net/sunrpc/svc.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,8 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
12871287
case SVC_OK:
12881288
break;
12891289
case SVC_GARBAGE:
1290-
goto err_garbage;
1290+
rqstp->rq_auth_stat = rpc_autherr_badcred;
1291+
goto err_bad_auth;
12911292
case SVC_SYSERR:
12921293
rpc_stat = rpc_system_err;
12931294
goto err_bad;
@@ -1416,10 +1417,6 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
14161417
svc_putnl(resv, RPC_PROC_UNAVAIL);
14171418
goto sendit;
14181419

1419-
err_garbage:
1420-
svc_printk(rqstp, "failed to decode args\n");
1421-
1422-
rpc_stat = rpc_garbage_args;
14231420
err_bad:
14241421
serv->sv_stats->rpcbadfmt++;
14251422
svc_putnl(resv, ntohl(rpc_stat));

0 commit comments

Comments
 (0)