UBUNTU: SAUCE: LSM stacking: add stacking support to apparmor network hooks

[mirror_ubuntu-bionic-kernel.git] / security / keys / keyring.c

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 36f842ec87f04580dfd051f4e50d395242a69eb6..d0bccebbd3b51cedb842ce574f65d448856650c0 100644 (file)
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -565,7 +565,7 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
 
        /* skip invalidated, revoked and expired keys */
        if (ctx->flags & KEYRING_SEARCH_DO_STATE_CHECK) {
-               time_t expiry = READ_ONCE(key->expiry);
+               time64_t expiry = READ_ONCE(key->expiry);
 
                if (kflags & ((1 << KEY_FLAG_INVALIDATED) |
                              (1 << KEY_FLAG_REVOKED))) {
@@ -574,7 +574,7 @@ static int keyring_search_iterator(const void *object, void *iterator_data)
                        goto skipped;
                }
 
-               if (expiry && ctx->now.tv_sec >= expiry) {
+               if (expiry && ctx->now >= expiry) {
                        if (!(ctx->flags & KEYRING_SEARCH_SKIP_EXPIRED))
                                ctx->result = ERR_PTR(-EKEYEXPIRED);
                        kleave(" = %d [expire]", ctx->skipped_ret);
@@ -834,10 +834,10 @@ found:
        key = key_ref_to_ptr(ctx->result);
        key_check(key);
        if (!(ctx->flags & KEYRING_SEARCH_NO_UPDATE_TIME)) {
-               key->last_used_at = ctx->now.tv_sec;
-               keyring->last_used_at = ctx->now.tv_sec;
+               key->last_used_at = ctx->now;
+               keyring->last_used_at = ctx->now;
                while (sp > 0)
-                       stack[--sp].keyring->last_used_at = ctx->now.tv_sec;
+                       stack[--sp].keyring->last_used_at = ctx->now;
        }
        kleave(" = true");
        return true;
@@ -898,7 +898,7 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
        }
 
        rcu_read_lock();
-       ctx->now = current_kernel_time();
+       ctx->now = ktime_get_real_seconds();
        if (search_nested_keyrings(keyring, ctx))
                __key_get(key_ref_to_ptr(ctx->result));
        rcu_read_unlock();
@@ -1149,7 +1149,7 @@ struct key *find_keyring_by_name(const char *name, bool uid_keyring)
                         * (ie. it has a zero usage count) */
                        if (!refcount_inc_not_zero(&keyring->usage))
                                continue;
-                       keyring->last_used_at = current_kernel_time().tv_sec;
+                       keyring->last_used_at = ktime_get_real_seconds();
                        goto out;
                }
        }
@@ -1489,7 +1489,7 @@ static void keyring_revoke(struct key *keyring)
 static bool keyring_gc_select_iterator(void *object, void *iterator_data)
 {
        struct key *key = keyring_ptr_to_key(object);
-       time_t *limit = iterator_data;
+       time64_t *limit = iterator_data;
 
        if (key_is_dead(key, *limit))
                return false;
@@ -1500,7 +1500,7 @@ static bool keyring_gc_select_iterator(void *object, void *iterator_data)
 static int keyring_gc_check_iterator(const void *object, void *iterator_data)
 {
        const struct key *key = keyring_ptr_to_key(object);
-       time_t *limit = iterator_data;
+       time64_t *limit = iterator_data;
 
        key_check(key);
        return key_is_dead(key, *limit);
@@ -1512,7 +1512,7 @@ static int keyring_gc_check_iterator(const void *object, void *iterator_data)
  * Not called with any locks held.  The keyring's key struct will not be
  * deallocated under us as only our caller may deallocate it.
  */
-void keyring_gc(struct key *keyring, time_t limit)
+void keyring_gc(struct key *keyring, time64_t limit)
 {
        int result;