Skip to content

Commit ac33733

Browse files
Anderson Nascimentokuba-moo
authored andcommitted
rxrpc: Fix missing validation of ticket length in non-XDR key preparsing
In rxrpc_preparse(), there are two paths for parsing key payloads: the XDR path (for large payloads) and the non-XDR path (for payloads <= 28 bytes). While the XDR path (rxrpc_preparse_xdr_rxkad()) correctly validates the ticket length against AFSTOKEN_RK_TIX_MAX, the non-XDR path fails to do so. This allows an unprivileged user to provide a very large ticket length. When this key is later read via rxrpc_read(), the total token size (toksize) calculation results in a value that exceeds AFSTOKEN_LENGTH_MAX, triggering a WARN_ON(). [ 2001.302904] WARNING: CPU: 2 PID: 2108 at net/rxrpc/key.c:778 rxrpc_read+0x109/0x5c0 [rxrpc] Fix this by adding a check in the non-XDR parsing path of rxrpc_preparse() to ensure the ticket length does not exceed AFSTOKEN_RK_TIX_MAX, bringing it into parity with the XDR parsing logic. Fixes: 8a7a3eb ("KEYS: RxRPC: Use key preparsing") Fixes: 84924aa ("rxrpc: Fix checker warning") Reported-by: Anderson Nascimento <[email protected]> Signed-off-by: Anderson Nascimento <[email protected]> Signed-off-by: David Howells <[email protected]> cc: Marc Dionne <[email protected]> cc: Jeffrey Altman <[email protected]> cc: Simon Horman <[email protected]> cc: [email protected] cc: [email protected] Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 6929350 commit ac33733

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

net/rxrpc/key.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,10 @@ static int rxrpc_preparse(struct key_preparsed_payload *prep)
502502
if (v1->security_index != RXRPC_SECURITY_RXKAD)
503503
goto error;
504504

505+
ret = -EKEYREJECTED;
506+
if (v1->ticket_length > AFSTOKEN_RK_TIX_MAX)
507+
goto error;
508+
505509
plen = sizeof(*token->kad) + v1->ticket_length;
506510
prep->quotalen += plen + sizeof(*token);
507511

0 commit comments

Comments
 (0)