diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-11-24 03:54:11 +0300 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-11-24 03:54:11 +0300 |
| commit | ce44cd8dfc55110fa7423ceb47a8a70dac65fe89 (patch) | |
| tree | 632da275c702e37c9fbad5791ca6455242bb1177 /security/keys/permission.c | |
| parent | 5a787756b809888e8925d722862167f1229b58f7 (diff) | |
| parent | 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 (diff) | |
| download | linux-ce44cd8dfc55110fa7423ceb47a8a70dac65fe89.tar.xz | |
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 'security/keys/permission.c')
| -rw-r--r-- | security/keys/permission.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/keys/permission.c b/security/keys/permission.c index a72b4dd70c8a..f68dc04d614e 100644 --- a/security/keys/permission.c +++ b/security/keys/permission.c @@ -89,7 +89,7 @@ EXPORT_SYMBOL(key_task_permission); int key_validate(const struct key *key) { unsigned long flags = READ_ONCE(key->flags); - time_t expiry = READ_ONCE(key->expiry); + time64_t expiry = READ_ONCE(key->expiry); if (flags & (1 << KEY_FLAG_INVALIDATED)) return -ENOKEY; @@ -101,8 +101,7 @@ int key_validate(const struct key *key) /* check it hasn't expired */ if (expiry) { - struct timespec now = current_kernel_time(); - if (now.tv_sec >= expiry) + if (ktime_get_real_seconds() >= expiry) return -EKEYEXPIRED; } |