From: David Howells <dhowells@redhat.com>
Date: Tue, 29 Aug 2017 09:15:40 +0000 (+0100)
Subject: rxrpc: Use correct timestamp from Kerberos 5 ticket
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a3785855edcdb326ebf052c4f92ebc2710614c6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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 e2d36619b53a..e7f6b8823eb6 100644
--- 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;