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 67D9AC77B60 for ; Mon, 1 May 2023 03:07:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232686AbjEADHS (ORCPT ); Sun, 30 Apr 2023 23:07:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232625AbjEADEi (ORCPT ); Sun, 30 Apr 2023 23:04:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5737B46A5; Sun, 30 Apr 2023 20:01:44 -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 65BAF61780; Mon, 1 May 2023 03:01:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E21FC433A1; Mon, 1 May 2023 03:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910061; bh=FA7dxqNtmn5rTL1SXkwSDJ3nhxD4XuKLZ2jRLt+oH7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VAnF85rr3wwLvLNFZepfc2tPAZP682xaOAbNJOfnzIbuJOtI8rnJu5Jkd00tPcJnv ahVXY80EObgDJk3yjp/qvyCR9wB1XZU8HRGPLLP2/HZ0lHog899zfLtN3gRK0IShHC R2w/CJ4nIWMbvJMXnQUekwNxXhy/W7YNO9luPYRdVFZAIEntnS4eFqoaY0VPnYXffw jpTj+fBZyROGqPJZEkeorOHdl0yt/LjibxtOzgs8FoGjlOlj51hrPNmYf5N2mXiknZ tcT9bjqNmjvA/4vLm183cvvdooGhe4S1epuA/0Uh4ECaL5jKl3VFl68vOuJYtS4YLP F6KiGdb2hA2Xw== 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 6.2 21/37] ACPI: EC: Fix oops when removing custom query handlers Date: Sun, 30 Apr 2023 22:59:29 -0400 Message-Id: <20230501025945.3253774-21-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501025945.3253774-1-sashal@kernel.org> References: <20230501025945.3253774-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 105d2e795afad..9658e348dc17d 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1122,6 +1122,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