From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793828889; b=PboYS4p3zndeZlkP3ScDDp0A4D72geiGWkqtj5fJa8Yf1M4YNQS70QmNKx5Nieupwb56 Gv33wnKdrKzPdkrsNYShUZcMfy6V05L2b60GqlZzBcKGgricrt5kAO+meh0S6I5AYoyqB PD/qxm6BgZJuu34ju0IpGV/4HtcDyUV87eNHbcY87z2JjUnyGK3Q0hWVQG7ux89sw2zh0 7Ms0hy86plUk0vizvFiIB6X41OUK/LG9rGcszun6gVPFWsF1At0sWVt4dyeYi1q8Z6MKf jZcjVnrFxftPt/KJprwwh3bnB9P8t2XNMv0JAmPmOg0T62mLIjN0xTVFhx5PBVODOig== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793828889; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=b3jOMufO/Wsmj9VQUFv2mJFu33oRqQh3E9+QSc2R+bI=; b=0EcVodF4OSXcZUedk4FBeTQA12vr6BOVHqveUBoBNhUmAR6ujNf/N1RZqOkbhLULm0IK kFeWJY90nqwau8NOXF+brVHMU1Wzz2wjAjH0HiKU8OkDVfhFkyCMDaLP3HVsPkZzLTIDv F2vazASCjB6YTio4pU3Cjxdn3uvECTTWzoBVfVntGNQGhttgBNPjzxQ1EmNz19AKxSBmu mE0kq4cmpf2J8aIv3Q9GcmK3cqMM3du0xTDUVc4RQQKupUl8vceM4xP7HpZiYVV3WcefL VKiAGAKvMSyzo6uZMIQznngmEYWNJN7y5o0hyKrmcWnQcHxdJp5VanaH3GwK/IhgWFg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LTdVH5Ox; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFE57607040A; Wed, 4 Nov 2026 21:48:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LTdVH5Ox Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DA001F000C1; Wed, 4 Nov 2026 21:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793828888; bh=b3jOMufO/Wsmj9VQUFv2mJFu33oRqQh3E9+QSc2R+bI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LTdVH5OxI9pvOu9TbZ1L/2X0mGs9NND2SHIPEu3w3YdWMsdOYvYmmtN0t25dfh6iv O6iquW0qi8/gA/DSYJMi9akyvIC7q+ESw26VjJbGZi0mRhAPw8p8bVKXhFNYEtmE/k P/Us1NjdgyqcFYL46pQgrk418GnpetB4UFHeTO80= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sean Young , Hans Verkuil Subject: [PATCH 7.3 266/547] media: rc: Fix race condition during rc_register_device() Date: Wed, 4 Nov 2026 16:07:30 -0500 Message-ID: <20261104211045.745189135@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211038.406938024@linuxfoundation.org> References: <20261104211038.406938024@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Young commit ec7cb49871e5c4f85d57290320c50ee0bae4db84 upstream. Device drivers can call ir_raw_event_store() or ir_raw_event_handle() right after rc_allocate_device(). This means that while rc_register_device() is being called, those functions can be called from e.g. interrupt handlers. Currently dev->raw is being allocated and populated by ir_raw_event_prepare() which is called from rc_register_device(). This is not done in a safe way, e.g. dev->raw is being set before the raw members are populated. Call ir_raw_event_prepare() from rc_allocate_device() instead. Fixes: a3572c34da8d ("V4L/DVB: ir-core: Add logic to decode IR protocols at the IR core") Signed-off-by: Sean Young Cc: stable@vger.kernel.org Reviewed-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/rc/rc-ir-raw.c | 20 +------------------- drivers/media/rc/rc-main.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 27 deletions(-) --- a/drivers/media/rc/rc-ir-raw.c +++ b/drivers/media/rc/rc-ir-raw.c @@ -71,9 +71,6 @@ static int ir_raw_event_thread(void *dat */ int ir_raw_event_store(struct rc_dev *dev, struct ir_raw_event *ev) { - if (!dev->raw) - return -EINVAL; - dev_dbg(&dev->dev, "sample: (%05dus %s)\n", ev->duration, TO_STR(ev->pulse)); @@ -102,9 +99,6 @@ int ir_raw_event_store_edge(struct rc_de ktime_t now; struct ir_raw_event ev = {}; - if (!dev->raw) - return -EINVAL; - now = ktime_get(); ev.duration = ktime_to_us(ktime_sub(now, dev->raw->last_event)); ev.pulse = !pulse; @@ -129,9 +123,6 @@ int ir_raw_event_store_with_timeout(stru ktime_t now; int rc = 0; - if (!dev->raw) - return -EINVAL; - now = ktime_get(); spin_lock(&dev->raw->edge_spinlock); @@ -166,9 +157,6 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_wit */ int ir_raw_event_store_with_filter(struct rc_dev *dev, struct ir_raw_event *ev) { - if (!dev->raw) - return -EINVAL; - /* Ignore spaces in idle mode */ if (dev->idle && !ev->pulse) return 0; @@ -200,9 +188,6 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_wit */ void ir_raw_event_set_idle(struct rc_dev *dev, bool idle) { - if (!dev->raw) - return; - dev_dbg(&dev->dev, "%s idle mode\n", idle ? "enter" : "leave"); if (idle) { @@ -226,7 +211,7 @@ EXPORT_SYMBOL_GPL(ir_raw_event_set_idle) */ void ir_raw_event_handle(struct rc_dev *dev) { - if (!dev->raw || !dev->raw->thread) + if (!dev->raw->thread) return; wake_up_process(dev->raw->thread); @@ -612,9 +597,6 @@ EXPORT_SYMBOL(ir_raw_encode_carrier); */ int ir_raw_event_prepare(struct rc_dev *dev) { - if (!dev) - return -EINVAL; - dev->raw = kzalloc_obj(*dev->raw); if (!dev->raw) return -ENOMEM; --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -1701,14 +1701,24 @@ static const struct device_type rc_dev_t struct rc_dev *rc_allocate_device(enum rc_driver_type type) { struct rc_dev *dev; + int ret; dev = kzalloc_obj(*dev); if (!dev) return NULL; + if (type == RC_DRIVER_IR_RAW) { + ret = ir_raw_event_prepare(dev); + if (ret < 0) { + kfree(dev); + return NULL; + } + } + if (type != RC_DRIVER_IR_RAW_TX) { dev->input_dev = input_allocate_device(); if (!dev->input_dev) { + ir_raw_event_free(dev); kfree(dev); return NULL; } @@ -1724,6 +1734,7 @@ struct rc_dev *rc_allocate_device(enum r spin_lock_init(&dev->rc_map.lock); spin_lock_init(&dev->keylock); } + mutex_init(&dev->lock); dev->dev.type = &rc_dev_type; @@ -1917,12 +1928,6 @@ int rc_register_device(struct rc_dev *de dev->sysfs_groups[attr++] = &rc_dev_wakeup_filter_attr_grp; dev->sysfs_groups[attr++] = NULL; - if (dev->driver_type == RC_DRIVER_IR_RAW) { - rc = ir_raw_event_prepare(dev); - if (rc < 0) - goto out_minor; - } - if (dev->driver_type != RC_DRIVER_IR_RAW_TX) { rc = rc_prepare_rx_device(dev); if (rc) @@ -1987,8 +1992,6 @@ out_rx_free: out_free_table: ir_free_table(&dev->rc_map); out_raw: - ir_raw_event_free(dev); -out_minor: ida_free(&rc_ida, minor); return rc; }