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=1793846204; b=icbkRLKeziCmdSI7CLvwMGTwdLrketi01T/m3qGij4dWZxcRiZTchvvZIvggyAevx7Lx pMYqLLHGe/ql/lwvghCP3PKEspRvWvvjK3PtuDIGXXMNNPq+UNRtMUB/IP8WIBwNJMDcF FVfMzjpA/ilZzqFV3qz36DulzYkhE0XYb+YwJJSIvv/Tg19AHPtK4HNJh3epJw4gT6ooA 2hQzhpx2FSihG0g+Jw298s2d0EDIt5OvIptbyBkjW3H2bl11+N9JnizuBnXdBq8xIFnuN q016LPX7XjCToUY649NFWxK+1GLWvGVmvt3OQERb3XmRuCMPvzO9WA21QAOQZkZfVAg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793846204; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=ZP77+xsd/7nnSx+UPXnNKCcslnA7hbgQi64VbvulfaU=; b=GK7QYrpy1+ZxCPAMx1Q5rMD7aJQMLY2FPdaojtulOXF1jHIlt35YUu1sITie49qAIXEt VFtZDEvomYk/p/JWqfSpUq1MeIJIahCZDSeaXVcKK7M0ReIeDy5KHrvsr1C+MDyrj42rF SyVLYnDIm/XGxHYYMKQfv4xDQ4laZyvVR0iGbGKyyK7ySu4UaQLHygbNGX98dxLTtlMkS RrmKtlVf+5L/Zm6BUTqd0GB4aQOJuGNoUPh08L4ZB344auO3xTGxTaRtU41ewENuIBYRr Oml7c28H1sTH+9L9jdjrHA7RJ2NXYu53vexo9RdINiXu+ZKlayKsmfbyw+Ov2mmxG/A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=DtaZalq1; 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 08459606A328 for ; Thu, 5 Nov 2026 02:36:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=DtaZalq1 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E3E01F000C1; Thu, 5 Nov 2026 02:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793846203; bh=ZP77+xsd/7nnSx+UPXnNKCcslnA7hbgQi64VbvulfaU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DtaZalq1FSbj40b2Mzy8OzMM9URMFhjAQaf/Kz1m7dYHHLhbsjZ0ZgWWxZRMt8VAF GDpZnQwoKJ4OgyN+Pc1//McHqdiFB9c5hhdTSfOsuaDoy702geENeRBxo6HTWN5Dym 1LxsIks97A2qc89Nmc1E16vyDhXgHiQUVafrugX/SjM55oTwss9EJ5BE0D+zdVfzSE 48xidQV4PsEyys9hDSHAjaRM282+6D8wWxQVc7fawf+8yalWeVLG2bcMs7QQvMb1uA 2KuvWlnBCoIx50VYAC/jr6iiacRux3urVQHfXnVzsyQg3eZKi0ntYGwC1gpbWBA2i7 rtkVb7+m/4g7g== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Young , Hans Verkuil , Sasha Levin Subject: [PATCH 6.6.y] media: rc: Fix race condition during rc_register_device() Date: Wed, 4 Nov 2026 21:36:41 -0500 Message-ID: <20261105023628.1202162-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026110405-cradle-clubbed-c6b7@gregkh> References: <2026110405-cradle-clubbed-c6b7@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Young [ Upstream commit ec7cb49871e5c4f85d57290320c50ee0bae4db84 ] 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 [ sashal: adjusted context for kzalloc() allocations and the out_free_table cleanup label ] Signed-off-by: Sasha Levin --- drivers/media/rc/rc-ir-raw.c | 20 +------------------- drivers/media/rc/rc-main.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c index b84fc9dc2a017..6d7b2577e463f 100644 --- a/drivers/media/rc/rc-ir-raw.c +++ b/drivers/media/rc/rc-ir-raw.c @@ -72,9 +72,6 @@ static int ir_raw_event_thread(void *data) */ 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)); @@ -103,9 +100,6 @@ int ir_raw_event_store_edge(struct rc_dev *dev, bool pulse) 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; @@ -130,9 +124,6 @@ int ir_raw_event_store_with_timeout(struct rc_dev *dev, struct ir_raw_event *ev) ktime_t now; int rc = 0; - if (!dev->raw) - return -EINVAL; - now = ktime_get(); spin_lock(&dev->raw->edge_spinlock); @@ -167,9 +158,6 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_with_timeout); */ 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; @@ -201,9 +189,6 @@ EXPORT_SYMBOL_GPL(ir_raw_event_store_with_filter); */ 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) { @@ -227,7 +212,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); @@ -605,9 +590,6 @@ EXPORT_SYMBOL(ir_raw_encode_carrier); */ int ir_raw_event_prepare(struct rc_dev *dev) { - if (!dev) - return -EINVAL; - dev->raw = kzalloc(sizeof(*dev->raw), GFP_KERNEL); if (!dev->raw) return -ENOMEM; diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c index 2eaacfa1e29eb..e2a12dd265621 100644 --- 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_type = { struct rc_dev *rc_allocate_device(enum rc_driver_type type) { struct rc_dev *dev; + int ret; dev = kzalloc(sizeof(*dev), GFP_KERNEL); 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 rc_driver_type type) spin_lock_init(&dev->rc_map.lock); spin_lock_init(&dev->keylock); } + mutex_init(&dev->lock); dev->dev.type = &rc_dev_type; @@ -1922,12 +1933,6 @@ int rc_register_device(struct rc_dev *dev) 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) @@ -1991,8 +1996,6 @@ int rc_register_device(struct rc_dev *dev) 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; } -- 2.53.0