From patchwork Mon Jan 30 04:43:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 50134 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2007620wrn; Sun, 29 Jan 2023 20:50:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXtCpJThXv4FsD2Y0ti+nGkBV3VXTyBFOSLxKRejPwWdz+K/XMYbRgDNoiKCtOQDjmU6XqnD X-Received: by 2002:a05:6402:493:b0:46d:53d7:d21e with SMTP id k19-20020a056402049300b0046d53d7d21emr49381481edv.27.1675054203859; Sun, 29 Jan 2023 20:50:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675054203; cv=none; d=google.com; s=arc-20160816; b=a8h/YAX5SCsJ7lQAWsMXSPo4TBGNyp0xOb87091dVwKOrWon/rvE6cxaFxbaci/uoP exwaL4TdckiStjUgf0AzkWco8zz8xDl7jtMwGJz9qcCjL4xFFcbQSNEuz1CZ4huEI0tp ZN1s0d8C7L3Fiqhpym+N2wbI2IkdrKiELZrVF3Rjj2OrsoK5fno3j8bicUwJiTHsUVHp FIiCz6QoGnG2vs6zM9hZsTP3JtJ9EJmTbgHqSJ11vMIWSVcX22aUUO8J0Yo7SR1PGPiE aQ+JefVnVvvGtj8UZ5z4h/BWYmoIbgxiJ+vSz1xtp1rASNy6t0M53LoJ6al1z7IZYpc8 Frzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=LiNNPqaXQM9yS0J3io8bIAgUtUxZYRaSMrpFctF6XsM=; b=Rw1jBrAphbz2cGB6bMTRpSXrZN1NC4MEwuHylr7nKwZABZ/voY2hQQ3cmE0v/LXu8e imJcCWRkJb1Nuojz9z/c1LpRnxBCDJpHIaiiEG3CxI9WFot7URzET01OC5fiM08uZORB oqPHjWMgCitEAxm+ohg+XXzO0qM/UUYVAx+ZRIhFrYu069plF/XdJ/vFIdS2tZl2vDls 5/8BT8ivPLgf5sG7X+xR0iYjFuMT6cdek8ods5+FRXYKQSnNVglYaFjTXuz4v/Rc0qub hcVGpJQruAa5zKf5pfCUpphuVFIaD+rpCKGDgQhOtMSg5N25jCCGkSfxKzH2cbq9827s J4nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="Fr/9psA8"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 17-20020a170906025100b00871a4e8d7bfsi14282716ejl.230.2023.01.29.20.49.40; Sun, 29 Jan 2023 20:50:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="Fr/9psA8"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235314AbjA3En2 (ORCPT + 99 others); Sun, 29 Jan 2023 23:43:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235500AbjA3EnZ (ORCPT ); Sun, 29 Jan 2023 23:43:25 -0500 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A428222F8; Sun, 29 Jan 2023 20:43:24 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id 144so6842111pfv.11; Sun, 29 Jan 2023 20:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=LiNNPqaXQM9yS0J3io8bIAgUtUxZYRaSMrpFctF6XsM=; b=Fr/9psA8hpDY8+DJ12nrG4pU05Kt2ZHI9rrvODh/GF7dNbM7TPubpN64DtQiDgeG4r T6ece7USNCKJ16Op/dA0dn90RDa/vC4uj181E1KqXMHTx6TdWX0UC1e9qRQo90EZKOnT WjVCNqvQn4TrfxTd1Vq3IVyeyC/jfmKzkNjOWWyQ4egozDgHr938p8kV8zzxcERmcbnE V5to2G5douPTRHg7O+pskFlEpZkCYrMyjsjnJ5p7Y5r9+bq2vuNFBejxcMkbyhs56yoW 4VoT8gI/4mVcepjyIci1OV3xlO+zOnBubaduP6IhNcZCvlyV3J7D4SfddE1nrICp2B8L 1gxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LiNNPqaXQM9yS0J3io8bIAgUtUxZYRaSMrpFctF6XsM=; b=BJZUMT9Z4J/dVZTH2Yz/9wySOiVSwCVg/urCuTfYuj7AffKwQ09i4l3IUJEXYzXPlU HGUnJ+6QmFdHFDWIArKOzMiUrFbFLGimhAQOrepgJeIUjjISo+S94nHGkNfXzGzoQcq6 IQAwevoDy8fkeyey/aJdC8Mbq9tFBL0IgHCVIHswECVjrg0Edtn43kREqIz/Rouk/k0a cYfmhaIb2/H6i8GV143fuzvqSOuIDFAK2hH/iy6F7phAekGhP79V++eMgxYLTEujJ6oL QapdzgCmKDwSw7uBkpVhicQtkPaYT54AjvgY2t/7Z6oURxfStaMXYirRgyppojKh/scT B+FA== X-Gm-Message-State: AO0yUKW/ftESScLmDpqlfv9qU7N0de7jTxbwcqb0yQ61RBwaFZyZw3NP mk8EscZ3MuXCq8VXhhQypvsOTuq8IZU= X-Received: by 2002:aa7:8114:0:b0:590:7636:d435 with SMTP id b20-20020aa78114000000b005907636d435mr5583073pfi.13.1675053803472; Sun, 29 Jan 2023 20:43:23 -0800 (PST) Received: from google.com ([2620:15c:9d:2:6882:174b:bc70:101]) by smtp.gmail.com with ESMTPSA id 74-20020a62164d000000b0058b59c81a29sm6217336pfw.220.2023.01.29.20.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 20:43:22 -0800 (PST) Date: Sun, 29 Jan 2023 20:43:19 -0800 From: Dmitry Torokhov To: "Stahl, Michael" , linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] Input: exc3000 - properly stop timer on shutdown Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756421636613532226?= X-GMAIL-MSGID: =?utf-8?q?1756421636613532226?= 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" Signed-off-by: Dmitry Torokhov --- drivers/input/touchscreen/exc3000.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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);