Merge tag 'v4.6-rc6' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 03dd576e6773..59fd7c0b119c 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -524,7 +524,9 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
                         free_slot = i;
                         continue;
                 }
-                if (ops->compare_object(assoc_array_ptr_to_leaf(ptr), index_key)) {
+                if (assoc_array_ptr_is_leaf(ptr) &&
+                    ops->compare_object(assoc_array_ptr_to_leaf(ptr),
+                                        index_key)) {
                         pr_devel("replace in slot %d\n", i);
                         edit->leaf_p = &node->slots[i];
                         edit->dead_leaf = node->slots[i];