From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4769CC77B73 for ; Mon, 1 May 2023 03:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233563AbjEADTX (ORCPT ); Sun, 30 Apr 2023 23:19:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233858AbjEADQW (ORCPT ); Sun, 30 Apr 2023 23:16:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24709658F; Sun, 30 Apr 2023 20:07:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B20BB61137; Mon, 1 May 2023 03:05:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DE0BC433EF; Mon, 1 May 2023 03:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910354; bh=d2iGA6U1G93m7fcgvIrolP/V/MrOkik0/FSmaX4JwkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TaD3wHTj9mrTEb5HTpvuhzmUv/X5pvWjGgRoYrMMOa5Yd4Y0lNivdy07NKt8lZzJx IjiUglUf9+HDfH9N/GxqymPROYx4r8hnbrNde8/zy6ejKmzvN9nXNWXbb8mwkMRqMX y9MbylE7QcjatDZ4rh3j8N6oUpItWeA9gemw5Uk3SQs3F8HyS2bIRaDnl71xTiTf3q 9hhvoCH1zOMC6NTVqsv/apTbR/XqDHZmLSC0EInPbQbIjvxpEv6vRFAdSQ7t2CsvyP cPyHMYWdPKrJVGu8i8wkqCHYqRXwKD4t/2bVwFYrkjnjUGFFlsamANrlqx4pO7H3YM vX2IvVtE3kK+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Armin Wolf , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 06/12] ACPI: EC: Fix oops when removing custom query handlers Date: Sun, 30 Apr 2023 23:05:32 -0400 Message-Id: <20230501030540.3254928-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501030540.3254928-1-sashal@kernel.org> References: <20230501030540.3254928-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Armin Wolf [ Upstream commit e5b492c6bb900fcf9722e05f4a10924410e170c1 ] When removing custom query handlers, the handler might still be used inside the EC query workqueue, causing a kernel oops if the module holding the callback function was already unloaded. Fix this by flushing the EC query workqueue when removing custom query handlers. Tested on a Acer Travelmate 4002WLMi Signed-off-by: Armin Wolf Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/ec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 4707d1808ca54..487884420fb0d 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1114,6 +1114,7 @@ static void acpi_ec_remove_query_handlers(struct acpi_ec *ec, void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit) { acpi_ec_remove_query_handlers(ec, false, query_bit); + flush_workqueue(ec_query_wq); } EXPORT_SYMBOL_GPL(acpi_ec_remove_query_handler); -- 2.39.2