From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 021B81AD40F; Tue, 9 Jul 2024 16:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542067; cv=none; b=LMiN1Ic68hbCRm8dOflQm8kbAMhW+s8mnmJE1HzHyP1lvwRFvCbIgLyCD4S4dW7rSGS+hlXkH2mPX4hxof1kPYKTj+JXv3k/xoc/LB6S//iheyIDJ5j3ZjE+ALUWE9yPM4JvDZ8yINOgfROYwEqF+Pmhhbvn44yUiejl2CxR55M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542067; c=relaxed/simple; bh=OgeW6r/3TgEoHQIobGhBV5y4ZCkyEeotVbU5NL5+zcU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QwhZckCVs7PewIg+IXZSYoQpkKpQh7jHMxlbfgjuNj4jqHvEKlrBuNtS3E+ubcmYp9RDOvsMvZKXnZQVcLRJ9b/fPUBwqu6e+ZKObrEGOkT4oVrij5lOef2xVKMJJOJ+qqBmWIH5bjuEtjqcM0V3yPMU0Oh65l6aCBz5HveVPns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iRZRSICv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iRZRSICv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76C75C32786; Tue, 9 Jul 2024 16:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542066; bh=OgeW6r/3TgEoHQIobGhBV5y4ZCkyEeotVbU5NL5+zcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iRZRSICvKYCcWJO6P9fS+P7HMDA3ogi1eHLyUQpo6MpsdVIui+HNQcV6lLVRt55UL CkC0kMfyxRW2nkN94luw/isGws2RfhkaStZDLGCwRh+f/QFsnPBpyAy5gnF94e8foW 4pTOrxMIkJQzr4bXD58pOytOTeyVzsIk/Ct+vO4Tf3GeWqLRzSA5Swl6vvHj9Lmzl+ sX3Tac8b6t7Nuanhe5JSbVS852XU+NJokiEvTGuRtPQJi1fbU3UfGQXVPo6UNona5Z 5vuwyjJU2PPpDYZ36o+n5NUm6kl+ZuQe6MDPZqkHyaakCPj020Gglu6Vv6ql9gZbGn v+QiG1M0wSr7w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heiko Carstens , Peter Oberparleiter , Alexander Gordeev , Sasha Levin , gor@linux.ibm.com, kees@kernel.org, justinstitt@google.com, linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 6.9 25/40] s390/sclp: Fix sclp_init() cleanup on failure Date: Tue, 9 Jul 2024 12:19:05 -0400 Message-ID: <20240709162007.30160-25-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709162007.30160-1-sashal@kernel.org> References: <20240709162007.30160-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.8 Content-Transfer-Encoding: 8bit From: Heiko Carstens [ Upstream commit 6434b33faaa063df500af355ee6c3942e0f8d982 ] If sclp_init() fails it only partially cleans up: if there are multiple failing calls to sclp_init() sclp_state_change_event will be added several times to sclp_reg_list, which results in the following warning: ------------[ cut here ]------------ list_add double add: new=000003ffe1598c10, prev=000003ffe1598bf0, next=000003ffe1598c10. WARNING: CPU: 0 PID: 1 at lib/list_debug.c:35 __list_add_valid_or_report+0xde/0xf8 CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.10.0-rc3 Krnl PSW : 0404c00180000000 000003ffe0d6076a (__list_add_valid_or_report+0xe2/0xf8) R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 RI:0 EA:3 ... Call Trace: [<000003ffe0d6076a>] __list_add_valid_or_report+0xe2/0xf8 ([<000003ffe0d60766>] __list_add_valid_or_report+0xde/0xf8) [<000003ffe0a8d37e>] sclp_init+0x40e/0x450 [<000003ffe00009f2>] do_one_initcall+0x42/0x1e0 [<000003ffe15b77a6>] do_initcalls+0x126/0x150 [<000003ffe15b7a0a>] kernel_init_freeable+0x1ba/0x1f8 [<000003ffe0d6650e>] kernel_init+0x2e/0x180 [<000003ffe000301c>] __ret_from_fork+0x3c/0x60 [<000003ffe0d759ca>] ret_from_fork+0xa/0x30 Fix this by removing sclp_state_change_event from sclp_reg_list when sclp_init() fails. Reviewed-by: Peter Oberparleiter Signed-off-by: Heiko Carstens Signed-off-by: Alexander Gordeev Signed-off-by: Sasha Levin --- drivers/s390/char/sclp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index d53ee34d398f6..fbe29cabcbb83 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c @@ -1293,6 +1293,7 @@ sclp_init(void) fail_unregister_reboot_notifier: unregister_reboot_notifier(&sclp_reboot_notifier); fail_init_state_uninitialized: + list_del(&sclp_state_change_event.list); sclp_init_state = sclp_init_state_uninitialized; free_page((unsigned long) sclp_read_sccb); free_page((unsigned long) sclp_init_sccb); -- 2.43.0