| From 6d32c1f592566f14f92f9a358d329eabce5df610 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 24 Oct 2025 12:24:33 +0200 |
| Subject: s390/ap: Don't leak debug feature files if AP instructions are not |
| available |
| |
| From: Heiko Carstens <hca@linux.ibm.com> |
| |
| [ Upstream commit 020d5dc57874e58d3ebae398f3fe258f029e3d06 ] |
| |
| If no AP instructions are available the AP bus module leaks registered |
| debug feature files. Change function call order to fix this. |
| |
| Fixes: cccd85bfb7bf ("s390/zcrypt: Rework debug feature invocations.") |
| Reviewed-by: Harald Freudenberger <freude@linux.ibm.com> |
| Signed-off-by: Heiko Carstens <hca@linux.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/s390/crypto/ap_bus.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c |
| index c692b55dd1169..4bc5210df78a4 100644 |
| --- a/drivers/s390/crypto/ap_bus.c |
| +++ b/drivers/s390/crypto/ap_bus.c |
| @@ -2196,15 +2196,15 @@ static int __init ap_module_init(void) |
| { |
| int rc; |
| |
| - rc = ap_debug_init(); |
| - if (rc) |
| - return rc; |
| - |
| if (!ap_instructions_available()) { |
| pr_warn("The hardware system does not support AP instructions\n"); |
| return -ENODEV; |
| } |
| |
| + rc = ap_debug_init(); |
| + if (rc) |
| + return rc; |
| + |
| /* init ap_queue hashtable */ |
| hash_init(ap_queues); |
| |
| -- |
| 2.51.0 |
| |
