diff options
| author | Baolin Wang <baolin.wang@linaro.org> | 2017-08-29 11:15:40 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-08-29 11:16:00 +0200 |
| commit | 10674a03c633379fadb5b314abde975fba270058 (patch) | |
| tree | 3f690f5c6e27d682bb590d52bc09ce41920b9100 /include/keys | |
| parent | hinic: don't build the module by default (diff) | |
| download | linux-10674a03c633379fadb5b314abde975fba270058.tar.xz linux-10674a03c633379fadb5b314abde975fba270058.zip | |
net: rxrpc: Replace time_t type with time64_t type
Since the 'expiry' variable of 'struct key_preparsed_payload' has been
changed to 'time64_t' type, which is year 2038 safe on 32bits system.
In net/rxrpc subsystem, we need convert 'u32' type to 'time64_t' type
when copying ticket expires time to 'prep->expiry', then this patch
introduces two helper functions to help convert 'u32' to 'time64_t'
type.
This patch also uses ktime_get_real_seconds() to get current time instead
of get_seconds() which is not year 2038 safe on 32bits system.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/keys')
| -rw-r--r-- | include/keys/rxrpc-type.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/keys/rxrpc-type.h b/include/keys/rxrpc-type.h index 5de0673f333b..8cf829dbf20e 100644 --- a/include/keys/rxrpc-type.h +++ b/include/keys/rxrpc-type.h @@ -127,4 +127,27 @@ struct rxrpc_key_data_v1 { #define AFSTOKEN_K5_ADDRESSES_MAX 16 /* max K5 addresses */ #define AFSTOKEN_K5_AUTHDATA_MAX 16 /* max K5 pieces of auth data */ +/* + * Truncate a time64_t to the range from 1970 to 2106 as in the network + * protocol. + */ +static inline u32 rxrpc_time64_to_u32(time64_t time) +{ + if (time < 0) + return 0; + + if (time > UINT_MAX) + return UINT_MAX; + + return (u32)time; +} + +/* + * Extend u32 back to time64_t using the same 1970-2106 range. + */ +static inline time64_t rxrpc_u32_to_time64(u32 time) +{ + return (time64_t)time; +} + #endif /* _KEYS_RXRPC_TYPE_H */ |