Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C93B38332F for ; Thu, 6 Aug 2026 13:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786023392; cv=none; b=McAGL76wILf7k+OpuEXgSTa+nSbB8R+Ps9aN37/C+OKuAAh6ziSF8pdQ/y4rsW8KJcDlDypmAVowAHthmZVhnoSL2745V5g8tgkUAG/S3AIf7YArK3rRn36lCls1Bp7L0xHyZAE9qI9BkLZQ5/QwK/gB8yYza9JPIcPtwVl9dCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786023392; c=relaxed/simple; bh=pXRiURNp3pOxogdfWIDpcXeZaAMF3QHk2BWZ2Aan4hg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IiL90oxxdOsqiaN4PFuKa93YW+lvuV7M7UkzGYijQd1PhKy9YxO+bTinB7A5HNNCSAWtVqDjOCsxV6TZxujh4FL+XoSttbTtTvGtc7PPnZgvFO2dC2lLkiXVlBe7u24c62PEBI1YUGkg7t/eYZoFBazAF/5AdIafZU5hEthxF4I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NEfNil1I; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NEfNil1I" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5107A1F00A3E; Thu, 6 Aug 2026 13:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786023379; bh=5DRFnebXYRDdb6Ooc2SGOVKnWROPhl74+E5/qJpTW/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NEfNil1IPH2XWP9lBH/lbkSH8QsDy9lkUDaFMfj0hol8CLtU083Q/ls9U9eLUrz2W vWuYbLL0lEHNJLmPMn3hGQWXm2vYX6StpkCymjsPDG+a5dMsWDUTipl5Mnji4ypYrv U2y4rOQLY49uuMsvXKWQlX7t/p8zxtzO2av4XNVl4B8cgwnU0O7b30kZxodH602CN1 3krCBsmjrlpRiq8RfpqDLpWJZ4Um7Z4EyEU2ldz/QUL3L7cVDqdLy/qkMkyZa8JsgV NtGEspT8Lszs/gM4mBdrppVni82srXulanAj+oGs9EyN3tHBLG4pvCVNbb6EVursIb Tzl4lXxwJlQ1w== From: Sasha Levin To: stable@vger.kernel.org Cc: Mirela Rabulea , Frank Li , Laurent Pinchart , Sakari Ailus , Sasha Levin Subject: [PATCH 6.6.y 2/2] media: v4l2-fwnode: Fix subdev owner overwritten in v4l2_async_register_subdev_sensor() Date: Thu, 6 Aug 2026 09:36:15 -0400 Message-ID: <20260806133615.470300-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260806133615.470300-1-sashal@kernel.org> References: <2026072936-heroism-pelican-745d@gregkh> <20260806133615.470300-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mirela Rabulea [ Upstream commit 06cb687a5132fcffe624c0070576ab852ac6b568 ] The v4l2 helper v4l2_async_register_subdev_sensor() calls v4l2_async_register_subdev(), which is a macro that expands to __v4l2_async_register_subdev(sd,THIS_MODULE). Since the macro is expanded inside v4l2-fwnode.c, THIS_MODULE resolves to the v4l2-fwnode module rather than the sensor driver module that originally set sd->owner. When v4l2-fwnode is built-in, THIS_MODULE evaluates to NULL, which then overwrites the sensor driver's owner with NULL. This causes the problem that the sensor module's reference count is never incremented during async registration, so the module can be removed while the subdevice is still in use by a notifier (e.g., a CSI-2 receiver bridge driver). Fix this by renaming v4l2_async_register_subdev_sensor() to __v4l2_async_register_subdev_sensor() with an added explicit module argument and introducing a wrapper macro: #define v4l2_async_register_subdev_sensor(sd) \ __v4l2_async_register_subdev_sensor(sd, THIS_MODULE) This ensures the sensor driver module is properly referenced even when the sensor driver does not init the owner field before calling v4l2_async_register_subdev_sensor() and prevents premature module removal. Fixes: aef69d54755d ("media: v4l: fwnode: Add a convenience function for registering sensors") Cc: stable@vger.kernel.org Suggested-by: Frank Li Link: https://lore.kernel.org/linux-media/20240315073125.275501-2-sakari.ailus@linux.intel.com/ Signed-off-by: Mirela Rabulea Reviewed-by: Laurent Pinchart Reviewed-by: Frank Li Signed-off-by: Sakari Ailus Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-fwnode.c | 6 +++--- include/media/v4l2-async.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index 7f181fbbb1407..519eaad0af5fc 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -1203,7 +1203,7 @@ v4l2_async_nf_parse_fwnode_sensor(struct device *dev, return 0; } -int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd) +int __v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd, struct module *module) { struct v4l2_async_notifier *notifier; int ret; @@ -1229,7 +1229,7 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd) if (ret < 0) goto out_cleanup; - ret = v4l2_async_register_subdev(sd); + ret = __v4l2_async_register_subdev(sd, module); if (ret < 0) goto out_unregister; @@ -1247,7 +1247,7 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd) return ret; } -EXPORT_SYMBOL_GPL(v4l2_async_register_subdev_sensor); +EXPORT_SYMBOL_GPL(__v4l2_async_register_subdev_sensor); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Sakari Ailus "); diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h index f26c323e9c963..54a2d9620ed5b 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -333,8 +333,10 @@ int __v4l2_async_register_subdev(struct v4l2_subdev *sd, struct module *module); * An error is returned if the module is no longer loaded on any attempts * to register it. */ +#define v4l2_async_register_subdev_sensor(sd) \ + __v4l2_async_register_subdev_sensor(sd, THIS_MODULE) int __must_check -v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd); +__v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd, struct module *module); /** * v4l2_async_unregister_subdev - unregisters a sub-device to the asynchronous -- 2.53.0