summaryrefslogtreecommitdiffstats
path: root/net/rxrpc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2017-08-29 10:15:40 +0100
committerDavid Howells <dhowells@redhat.com>2017-08-29 10:55:06 +0100
commit0a3785855edcdb326ebf052c4f92ebc2710614c6 (patch)
tree320a5da51eb6837d04992ee9ac6ceee34f9171b0 /net/rxrpc
parent10674a03c633379fadb5b314abde975fba270058 (diff)
downloadlinux-0a3785855edcdb326ebf052c4f92ebc2710614c6.tar.bz2
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>
Diffstat (limited to 'net/rxrpc')
-rw-r--r--net/rxrpc/key.c2
1 files changed, 1 insertions, 1 deletions
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;