Skip to content

Commit c0f7a44

Browse files
Anderson Nascimentoopsiff
authored andcommitted
rxrpc: Fix missing validation of ticket length in non-XDR key preparsing
commit ac33733b10b484d666f97688561670afd5861383 upstream. 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 <anderson@allelesecurity.com> Signed-off-by: Anderson Nascimento <anderson@allelesecurity.com> Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: Jeffrey Altman <jaltman@auristor.com> cc: Simon Horman <horms@kernel.org> cc: linux-afs@lists.infradead.org cc: stable@kernel.org Link: https://patch.msgid.link/20260422161438.2593376-7-dhowells@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 4458757c020592a3094366e0fb20457383b42f92) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 04efb4f commit c0f7a44

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
@@ -340,6 +340,10 @@ static int rxrpc_preparse(struct key_preparsed_payload *prep)
340340
if (v1->security_index != RXRPC_SECURITY_RXKAD)
341341
goto error;
342342

343+
ret = -EKEYREJECTED;
344+
if (v1->ticket_length > AFSTOKEN_RK_TIX_MAX)
345+
goto error;
346+
343347
plen = sizeof(*token->kad) + v1->ticket_length;
344348
prep->quotalen += plen + sizeof(*token);
345349

0 commit comments

Comments
 (0)