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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c
index e2d36619b53af0b06f52e06582f219c52d76dabd..e7f6b8823eb6e6c6794ed78e1197c1cf8aab4858 100644 (file)
--- a/net/rxrpc/key.c
+++ b/net/rxrpc/key.c
@@ -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;