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

Commit 27419604 authored by David Howells's avatar David Howells Committed by James Morris
Browse files

KEYS: Fix use-after-free in assoc_array_gc() 



An edit script should be considered inaccessible by a function once it has
called assoc_array_apply_edit() or assoc_array_cancel_edit().

However, assoc_array_gc() is accessing the edit script just after the
gc_complete: label.

Reported-by: default avatarAndreea-Cristina Bernat <bernat.ada@gmail.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarAndreea-Cristina Bernat <bernat.ada@gmail.com>
cc: shemming@brocade.com
cc: paulmck@linux.vnet.ibm.com
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 876c6e3e

lib/assoc_array.c

+1 −1
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ ascend_old_tree: 
gc_complete:

	edit->set[0].to = new_root;

	assoc_array_apply_edit(edit);

	edit->array->nr_leaves_on_tree = nr_leaves_on_tree;

	array->nr_leaves_on_tree = nr_leaves_on_tree;

	return 0;



enomem: