3.13.11.8 -stable review patch. If anyone has any objections, please let me know.
------------------ From: David Howells <[email protected]> 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 <[email protected]> Signed-off-by: David Howells <[email protected]> Reviewed-by: Andreea-Cristina Bernat <[email protected]> cc: [email protected] cc: [email protected] Signed-off-by: James Morris <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> --- lib/assoc_array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/assoc_array.c b/lib/assoc_array.c index 76ae279..f9524b8 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -1737,7 +1737,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: -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
