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 13EC3C678D5 for ; Tue, 7 Mar 2023 10:02:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230019AbjCGKCZ (ORCPT ); Tue, 7 Mar 2023 05:02:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbjCGKCX (ORCPT ); Tue, 7 Mar 2023 05:02:23 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 840963B222 for ; Tue, 7 Mar 2023 02:02:22 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 47F26B816CF for ; Tue, 7 Mar 2023 10:02:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D073C433EF; Tue, 7 Mar 2023 10:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678183340; bh=mrVpv62MXcxEuaKos8UbmM1Qh/+aQ6NEtRSbErPjmpc=; h=Subject:To:Cc:From:Date:From; b=rwwMRSl7ZLPRsnGZFXzTPDNIeCfaHvUKIUdDW/wkWYmn6hhcpBBQkno8FGI2k4aei h4+ED+nHxAl8G/Ni//6VQ5DB0pQGqVHO/rQXteWU6xahmHR4UBgzImJtg6FpDEJMcf xRjkvdsOw8D+iWURfoDbYE1eMnmIlxwEH3ieek1s= Subject: FAILED: patch "[PATCH] Input: exc3000 - properly stop timer on shutdown" failed to apply to 6.1-stable tree To: dmitry.torokhov@gmail.com, mstahl@moba.de Cc: From: Date: Tue, 07 Mar 2023 11:00:28 +0100 Message-ID: <16781832289284@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 79c81d137d36f9635bbcbc3916c0cccb418a61dd # git commit -s git send-email --to '' --in-reply-to '16781832289284@kroah.com' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 79c81d137d36 ("Input: exc3000 - properly stop timer on shutdown") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 79c81d137d36f9635bbcbc3916c0cccb418a61dd Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 3 Feb 2023 16:43:29 -0800 Subject: [PATCH] Input: exc3000 - properly stop timer on shutdown We need to stop the timer on driver unbind or probe failures, otherwise we get UAF/Oops. Fixes: 7e577a17f2ee ("Input: add I2C attached EETI EXC3000 multi touch driver") Reported-by: "Stahl, Michael" Link: https://lore.kernel.org/r/Y9dK57BFqtlf8NmN@google.com Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c index 4b7eee01c6aa..69eae79e2087 100644 --- a/drivers/input/touchscreen/exc3000.c +++ b/drivers/input/touchscreen/exc3000.c @@ -109,6 +109,11 @@ static inline void exc3000_schedule_timer(struct exc3000_data *data) mod_timer(&data->timer, jiffies + msecs_to_jiffies(EXC3000_TIMEOUT_MS)); } +static void exc3000_shutdown_timer(void *timer) +{ + timer_shutdown_sync(timer); +} + static int exc3000_read_frame(struct exc3000_data *data, u8 *buf) { struct i2c_client *client = data->client; @@ -386,6 +391,11 @@ static int exc3000_probe(struct i2c_client *client) if (error) return error; + error = devm_add_action_or_reset(&client->dev, exc3000_shutdown_timer, + &data->timer); + if (error) + return error; + error = devm_request_threaded_irq(&client->dev, client->irq, NULL, exc3000_interrupt, IRQF_ONESHOT, client->name, data);