summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-07-31 12:47:06 +0300
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-07-31 13:10:41 +0300
commit33c388b81ce4b2f249730014b9b9f103a7578ca2 (patch)
treec524c05300b46b8e7c1d14a277de74886c667399 /drivers/s390
parentef4423ce70b8a78768a6e854e4d84c082800317d (diff)
downloadlinux-33c388b81ce4b2f249730014b9b9f103a7578ca2.tar.xz
s390/zcrypt: fix possible memory leak in ap_module_init()
ap_configuration is malloced in ap_module_init() and should be freed before leaving from the error handling cases, otherwise it may cause memory leak. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/crypto/ap_bus.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 03e4d6246d87..ed92fb09fc8e 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1819,7 +1819,8 @@ int __init ap_module_init(void)
if (ap_domain_index < -1 || ap_domain_index > max_domain_id) {
pr_warn("%d is not a valid cryptographic domain\n",
ap_domain_index);
- return -EINVAL;
+ rc = -EINVAL;
+ goto out_free;
}
/* In resume callback we need to know if the user had set the domain.
* If so, we can not just reset it.
@@ -1892,6 +1893,7 @@ out:
unregister_reset_call(&ap_reset_call);
if (ap_using_interrupts())
unregister_adapter_interrupt(&ap_airq);
+out_free:
kfree(ap_configuration);
return rc;
}