Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a378585 authored by David Howells's avatar David Howells
Browse files

rxrpc: Use correct timestamp from Kerberos 5 ticket 



When an XDR-encoded Kerberos 5 ticket is added as an rxrpc-type key, the
expiry time should be drawn from the k5 part of the token union (which was
what was filled in), rather than the kad part of the union.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 10674a03

net/rxrpc/key.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static int rxrpc_preparse_xdr_rxk5(struct key_preparsed_payload *prep, 
	     pptoken = &(*pptoken)->next)

		continue;

	*pptoken = token;

	expiry = rxrpc_u32_to_time64(token->kad->expiry);

	expiry = rxrpc_u32_to_time64(token->k5->endtime);

	if (expiry < prep->expiry)

		prep->expiry = expiry;