Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c0b1c67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 51d7b120 58976eef

lib/assoc_array.c

+3 −1
Original line number Diff line number Diff line
@@ -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];

scripts/asn1_compiler.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ int main(int argc, char **argv) 
	}



	hdr = fopen(headername, "w");

	if (!out) {

	if (!hdr) {

		perror(headername);

		exit(1);

	}