Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull keys bugfixes from James Morris:
 "Two bugfixes for Keys related code"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ASN.1: fix open failure check on headername
  assoc_array: don't call compare_object() on a node

2 files changed, 4 insertions, 2 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];
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index e000f44e37b8..c1b7ef3e24c1 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -650,7 +650,7 @@ int main(int argc, char **argv)
         }
 
         hdr = fopen(headername, "w");
-        if (!out) {
+        if (!hdr) {
                 perror(headername);
                 exit(1);
         }