diff options
author | David Howells <dhowells@redhat.com> | 2014-09-02 08:52:20 -0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-02 20:30:22 -0400 |
commit | 27419604f51a97d497853f14142c1059d46eb597 (patch) | |
tree | e5098e23130775f553e0fe65b9315f288985ad48 /lib/assoc_array.c | |
parent | 876c6e3e028d1b326c81f6f134a4804b92f67dc7 (diff) |
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: 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
Cc: stable@vger.kernel.org
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'lib/assoc_array.c')
-rw-r--r-- | lib/assoc_array.c | 2 |
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: | |||
1735 | gc_complete: | 1735 | gc_complete: |
1736 | edit->set[0].to = new_root; | 1736 | edit->set[0].to = new_root; |
1737 | assoc_array_apply_edit(edit); | 1737 | assoc_array_apply_edit(edit); |
1738 | edit->array->nr_leaves_on_tree = nr_leaves_on_tree; | 1738 | array->nr_leaves_on_tree = nr_leaves_on_tree; |
1739 | return 0; | 1739 | return 0; |
1740 | 1740 | ||
1741 | enomem: | 1741 | enomem: |