From patchwork Mon Oct 16 23:14:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 45004 X-Patchwork-Delegate: sean@mess.org Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4Eb8-0008Co-FH; Mon, 16 Oct 2017 23:15:02 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756962AbdJPXOs (ORCPT + 1 other); Mon, 16 Oct 2017 19:14:48 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:55399 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754512AbdJPXOq (ORCPT ); Mon, 16 Oct 2017 19:14:46 -0400 Received: by mail-pf0-f169.google.com with SMTP id 17so16894243pfn.12 for ; Mon, 16 Oct 2017 16:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :content-transfer-encoding; bh=EKV944DAdb8m7xYUNtUiF+7Zx8psui3Upi27sq7waec=; b=dyLb/RFxGV+ZCtJWLEGm39vlml1Hd04/j5KX7s5BaUweFKZFnjjDITgtIiIZncRUcW yKR0xV9zRQ0ykCfAKwzAe+O/Z9vTWxQkpD4h4Auulfz5hgQk7BlWBgYs2cCnAAZVzYSB 30/Y3oTTL8ADzQ7f7WaWkgGqDCTZEd1oazR/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:content-transfer-encoding; bh=EKV944DAdb8m7xYUNtUiF+7Zx8psui3Upi27sq7waec=; b=U6EVgN+J9szESfPKL0RrTL6b+oK6HqrdlZZru0TfwSRPAueQzZWzfekxHZrYhss33k OKifrSNp6GPBL8tWBQgXSoAHV5C7qsalSmttvtRj3ugbd7hQu/AahHyFtgZ7A/Nf3L/B LWpqRS57xFFxQk/oy/sn5C/2DJjetdhTPZtQGW/9xoZcjSZ/gWPQpwO6pcal0rVkTabj sW/1lfd0nuZf7xB9tDzNZk7/KedNNNL/ebQi9zQfx9mYQ910WCUGLZD2iIfpW82t/y7M 9fJgOwflHzVA1ojjIwwRCUvHNvpvJXGocp4GlGNcnT3UX4SYOlQbyY7a+zhR4NcAPBon U/Wg== X-Gm-Message-State: AMCzsaXEX+lm/TyB6aJmhDM+zON7GFeyU3ViVc1fkYNXJfzrJW5WhvSe wkgoX5dcI26SjhQ3ZudAKSlaCQ== X-Google-Smtp-Source: ABhQp+QC6n1xMSSbRoxnkNmXvXnNOwEoG9gLkn7tNkkwSSR7GZuvryFG2SuBkXlPHETP030Kx6UQkQ== X-Received: by 10.159.195.73 with SMTP id z9mr8135061pln.346.1508195685701; Mon, 16 Oct 2017 16:14:45 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id u7sm10357377pfh.142.2017.10.16.16.14.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 16:14:44 -0700 (PDT) Date: Mon, 16 Oct 2017 16:14:43 -0700 From: Kees Cook To: Mauro Carvalho Chehab Cc: Dmitry Torokhov , Hans Verkuil , Sakari Ailus , Geliang Tang , linux-input@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: input: Convert timers to use timer_setup() Message-ID: <20171016231443.GA100011@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. One input_dev user hijacks the input_dev software autorepeat timer to perform its own repeat management. However, there is no path back to the existing status variable, so add a generic one to the input structure and use that instead. Cc: Dmitry Torokhov Cc: Mauro Carvalho Chehab Cc: Hans Verkuil Cc: Sakari Ailus Cc: Geliang Tang Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Signed-off-by: Kees Cook Acked-by: Pali Rohár --- drivers/input/input.c | 12 ++++++------ drivers/media/pci/ttpci/av7110.h | 1 - drivers/media/pci/ttpci/av7110_ir.c | 16 ++++++++-------- include/linux/input.h | 2 ++ 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/input/input.c b/drivers/input/input.c index d268fdc23c64..497ad2dcb699 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -76,7 +76,7 @@ static void input_start_autorepeat(struct input_dev *dev, int code) { if (test_bit(EV_REP, dev->evbit) && dev->rep[REP_PERIOD] && dev->rep[REP_DELAY] && - dev->timer.data) { + dev->timer.function) { dev->repeat_key = code; mod_timer(&dev->timer, jiffies + msecs_to_jiffies(dev->rep[REP_DELAY])); @@ -179,9 +179,9 @@ static void input_pass_event(struct input_dev *dev, * dev->event_lock here to avoid racing with input_event * which may cause keys get "stuck". */ -static void input_repeat_key(unsigned long data) +static void input_repeat_key(struct timer_list *t) { - struct input_dev *dev = (void *) data; + struct input_dev *dev = from_timer(dev, t, timer); unsigned long flags; spin_lock_irqsave(&dev->event_lock, flags); @@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void) device_initialize(&dev->dev); mutex_init(&dev->mutex); spin_lock_init(&dev->event_lock); - init_timer(&dev->timer); + timer_setup(&dev->timer, NULL, 0); INIT_LIST_HEAD(&dev->h_list); INIT_LIST_HEAD(&dev->node); @@ -2053,8 +2053,8 @@ static void devm_input_device_unregister(struct device *dev, void *res) */ void input_enable_softrepeat(struct input_dev *dev, int delay, int period) { - dev->timer.data = (unsigned long) dev; - dev->timer.function = input_repeat_key; + dev->timer.function = (TIMER_FUNC_TYPE)input_repeat_key; + dev->timer_data = 0; dev->rep[REP_DELAY] = delay; dev->rep[REP_PERIOD] = period; } diff --git a/drivers/media/pci/ttpci/av7110.h b/drivers/media/pci/ttpci/av7110.h index 347827925c14..b98a4f3006df 100644 --- a/drivers/media/pci/ttpci/av7110.h +++ b/drivers/media/pci/ttpci/av7110.h @@ -93,7 +93,6 @@ struct infrared { u8 inversion; u16 last_key; u16 last_toggle; - u8 delay_timer_finished; }; diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c index ca05198de2c2..a883caa6488c 100644 --- a/drivers/media/pci/ttpci/av7110_ir.c +++ b/drivers/media/pci/ttpci/av7110_ir.c @@ -155,16 +155,16 @@ static void av7110_emit_key(unsigned long parm) if (timer_pending(&ir->keyup_timer)) { del_timer(&ir->keyup_timer); if (ir->last_key != keycode || toggle != ir->last_toggle) { - ir->delay_timer_finished = 0; + ir->input_dev->timer_data = 0; input_event(ir->input_dev, EV_KEY, ir->last_key, 0); input_event(ir->input_dev, EV_KEY, keycode, 1); input_sync(ir->input_dev); - } else if (ir->delay_timer_finished) { + } else if (ir->input_dev->timer_data) { input_event(ir->input_dev, EV_KEY, keycode, 2); input_sync(ir->input_dev); } } else { - ir->delay_timer_finished = 0; + ir->input_dev->timer_data = 0; input_event(ir->input_dev, EV_KEY, keycode, 1); input_sync(ir->input_dev); } @@ -206,11 +206,12 @@ static void input_register_keys(struct infrared *ir) /* called by the input driver after rep[REP_DELAY] ms */ -static void input_repeat_key(unsigned long parm) +static void input_repeat_key(struct timer_list *t) { - struct infrared *ir = (struct infrared *) parm; + struct input_dev *dev = from_timer(dev, t, timer); - ir->delay_timer_finished = 1; + /* Key repeat started */ + dev->timer_data = 1; } @@ -365,8 +366,7 @@ int av7110_ir_init(struct av7110 *av7110) input_free_device(input_dev); return err; } - input_dev->timer.function = input_repeat_key; - input_dev->timer.data = (unsigned long) &av7110->ir; + input_dev->timer.function = (TIMER_FUNC_TYPE)input_repeat_key; if (av_cnt == 1) { e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops); diff --git a/include/linux/input.h b/include/linux/input.h index fb5e23c7ed98..dcd117bf1027 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -70,6 +70,7 @@ struct input_value { * @repeat_key: stores key code of the last key pressed; used to implement * software autorepeat * @timer: timer for software autorepeat + * @timer_data: timer data for software autorepeat overrides * @rep: current values for autorepeat parameters (delay, rate) * @mt: pointer to multitouch state * @absinfo: array of &struct input_absinfo elements holding information @@ -152,6 +153,7 @@ struct input_dev { unsigned int repeat_key; struct timer_list timer; + unsigned long timer_data; int rep[REP_CNT];