KEYS: Fix searching of nested keyrings

[~andy/linux] / security / keys / keyring.c

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 3dd8445cd489605802861cfc6363224d2ec91461..d46cbc5e335e9c330ccd74a08fcbf78aeafe8c96 100644 (file)
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -690,8 +690,8 @@ descend_to_node:
                smp_read_barrier_depends();
                ptr = ACCESS_ONCE(shortcut->next_node);
                BUG_ON(!assoc_array_ptr_is_node(ptr));
-               node = assoc_array_ptr_to_node(ptr);
        }
+       node = assoc_array_ptr_to_node(ptr);
 
 begin_node:
        kdebug("begin_node");