summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-09-02 13:52:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:22:22 -0700
commitb3c24771aaaa566ba977d67ea22d9758b31efe13 (patch)
tree7766bf414e14f1f62ce5dc0e1cca6ab1baef3892 /lib
parentc857808daf9f819010731b0e5669d315a623d41f (diff)
downloadlinux-stable-b3c24771aaaa566ba977d67ea22d9758b31efe13.tar.gz
linux-stable-b3c24771aaaa566ba977d67ea22d9758b31efe13.tar.bz2
linux-stable-b3c24771aaaa566ba977d67ea22d9758b31efe13.zip
KEYS: Fix use-after-free in assoc_array_gc()
commit 27419604f51a97d497853f14142c1059d46eb597 upstream. 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: Andreea-Cristina Bernat <bernat.ada@gmail.com> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Andreea-Cristina Bernat <bernat.ada@gmail.com> cc: shemming@brocade.com cc: paulmck@linux.vnet.ibm.com Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/assoc_array.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index c0b1007011e1..ae146f0734eb 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -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: