diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-11-24 01:54:11 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-11-24 01:54:11 +0100 |
| commit | ce44cd8dfc55110fa7423ceb47a8a70dac65fe89 (patch) | |
| tree | 632da275c702e37c9fbad5791ca6455242bb1177 /security/keys/process_keys.c | |
| parent | Merge tag 'pwm/for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | pkcs7: Set the module licence to prevent tainting (diff) | |
| download | linux-ce44cd8dfc55110fa7423ceb47a8a70dac65fe89.tar.xz linux-ce44cd8dfc55110fa7423ceb47a8a70dac65fe89.zip | |
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/process_keys.c')
| -rw-r--r-- | security/keys/process_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 740affd65ee9..d5b25e535d3a 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -738,7 +738,7 @@ try_again: if (ret < 0) goto invalid_key; - key->last_used_at = current_kernel_time().tv_sec; + key->last_used_at = ktime_get_real_seconds(); error: put_cred(ctx.cred); |