diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-11-24 11:54:11 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-11-24 11:54:11 +1100 |
| commit | ce44cd8dfc55110fa7423ceb47a8a70dac65fe89 (patch) | |
| tree | 632da275c702e37c9fbad5791ca6455242bb1177 /include/linux | |
| parent | 5a787756b809888e8925d722862167f1229b58f7 (diff) | |
| parent | 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 (diff) | |
Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next-keys
Merge keys subsystem changes from David Howells, for v4.15.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/key-type.h | 2 | ||||
| -rw-r--r-- | include/linux/key.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/key-type.h b/include/linux/key-type.h index 9520fc3c3b9a..05d8fb5a06c4 100644 --- a/include/linux/key-type.h +++ b/include/linux/key-type.h @@ -44,7 +44,7 @@ struct key_preparsed_payload { const void *data; /* Raw data */ size_t datalen; /* Raw datalen */ size_t quotalen; /* Quota length for proposed payload */ - time_t expiry; /* Expiry time of key */ + time64_t expiry; /* Expiry time of key */ } __randomize_layout; typedef int (*request_key_actor_t)(struct key_construction *key, diff --git a/include/linux/key.h b/include/linux/key.h index 8a15cabe928d..e58ee10f6e58 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -24,6 +24,7 @@ #include <linux/atomic.h> #include <linux/assoc_array.h> #include <linux/refcount.h> +#include <linux/time64.h> #ifdef __KERNEL__ #include <linux/uidgid.h> @@ -162,10 +163,10 @@ struct key { struct key_user *user; /* owner of this key */ void *security; /* security data for this key */ union { - time_t expiry; /* time at which key expires (or 0) */ - time_t revoked_at; /* time at which key was revoked */ + time64_t expiry; /* time at which key expires (or 0) */ + time64_t revoked_at; /* time at which key was revoked */ }; - time_t last_used_at; /* last time used for LRU keyring discard */ + time64_t last_used_at; /* last time used for LRU keyring discard */ kuid_t uid; kgid_t gid; key_perm_t perm; /* access permissions */ |