summaryrefslogtreecommitdiff
path: root/kernel/locking
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-17 05:38:15 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-17 05:38:14 -0700
commitf2b5c20a20626247665b913b6ec6cb37de0bfa89 (patch)
tree3e214059d460cbd3861557c3b43a567d49632785 /kernel/locking
parent6d08baec3167417c0950132dc231a7ae8e2bc283 (diff)
parentfda1654df897b537f5d33bda92ef7435b68c606f (diff)
Merge "Merge android-4.4@d68ba9f (v4.4.89) into msm-4.4"
Diffstat (limited to 'kernel/locking')
-rw-r--r--kernel/locking/locktorture.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 8ef1919d63b2..d580b7d6ee6d 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -776,6 +776,8 @@ static void lock_torture_cleanup(void)
else
lock_torture_print_module_parms(cxt.cur_ops,
"End of test: SUCCESS");
+ kfree(cxt.lwsa);
+ kfree(cxt.lrsa);
torture_cleanup_end();
}
@@ -917,6 +919,8 @@ static int __init lock_torture_init(void)
GFP_KERNEL);
if (reader_tasks == NULL) {
VERBOSE_TOROUT_ERRSTRING("reader_tasks: Out of memory");
+ kfree(writer_tasks);
+ writer_tasks = NULL;
firsterr = -ENOMEM;
goto unwind;
}