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=1795045102; b=OR8u/NjkG8I6d5twOx0P8Uu0c8X96+G8FRYKuTUSlGZCZTehi53P3e5VG7YSE+2En6bx Cal6qScsdpFwzXlyF57lO8QV1R2jrd2uZr0j0dFfCDD74Ewk+n0MoHmh6psgNHFcGAxd8 ra3yrme75ph0900D8iuWbtJtbKH9kDkYJciWqslpCUpAp8su47U+CSYw0cK6cbFsXXds8 nK15HEJUPhh2Gz1BBmO/bNubZPrYmv0n5odi7b7w2td2i4sYRSU+Vww6FgQw4RITXcfKh 8Gogo5fw77qMxd5JTh4vD9V/fSIXcgg3HtQsv2omV3vSYfwAIJKlmQtDn0bQTqKLaVg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045102; 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=4qmNUJMMk/umWIPVxu/o+xoBekqGS73dJJSznIqdbaY=; b=tudW1V0XboFWW3+JwU1NRjjBgdx2bBP0rJmzrO/LtlpkSss8c7FnERMNxplkKHOq/4HQ ciTIg8cOcRnM66jB7vjB7/52Neco7C2wuYiA0N/wxhwYeGuEiiWnw4k8TH7wGnfzOEoUJ EOUpXK/tNmAgeslFdFt/pScN3Wv7vOI4FYnsw4Oz97dU13g14Mq2Hx4xbBXLl/X2GnRS+ dbJqSHbFqMHpx4cduH+Yj9xpGeEg4oVpOIY447xAfjMHQ/+GYsWNyYXcc/nT4xbWnB0ZA C+XxnEnPCXj5nkP1uxsttQoAllWuUCOrXMfC/sw+Za5cECvDJxLoUTuckpzQXN6jQ9Q== 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=OOqrXrRm; 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 B3873606A33A; Wed, 18 Nov 2026 23:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OOqrXrRm Received: by smtp.kernel.org (Postfix) with ESMTPSA id 113E21F000C5; Wed, 18 Nov 2026 23:38:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045102; bh=4qmNUJMMk/umWIPVxu/o+xoBekqGS73dJJSznIqdbaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OOqrXrRmYuWucXzAHxUDJDJbpWsnqdE0VtNY4qACqm4GJr3BzjT7aw+K6Qs+zDn+K gCX72efetmDdPsVRzbTES7KHvhXaDaYRdggON/s2rcR3Pt2sZaIJtb6XBkZdvvuZMU YLftxcrgWZmTLJ9bz43fdrF8LEr5Yqch/O3YU/88= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+cf896de36144391bcde1@syzkaller.appspotmail.com, Hans Verkuil , Rohinthan P , Hans Verkuil , Sasha Levin Subject: [PATCH 6.1 0804/2857] media: v4l2-ctrls: do nothing if controls[0] == NULL in cluster functions Date: Wed, 18 Nov 2026 15:30:38 +0100 Message-ID: <20261118150230.521012463@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rohinthan P [ Upstream commit 9ff738f93084351ed6e818d4d58679a9e9083a8d ] The V4L2 control framework is designed to allow drivers to instantiate controls and clusters without checking for errors after each call, checking hdl->error only once at the end. However, if allocating the master control (controls[0]) fails, e.g. due to memory allocation failure, v4l2_ctrl_cluster() triggers a WARNING: ncontrols == 0 || controls[0] == NULL WARNING: drivers/media/v4l2-core/v4l2-ctrls-core.c:2525 at v4l2_ctrl_cluster Additionally, v4l2_ctrl_auto_cluster() attempts to dereference master->minimum without checking if controls[0] is NULL, leading to a NULL pointer dereference when master control creation fails. Update both v4l2_ctrl_cluster() and v4l2_ctrl_auto_cluster() to silently return if controls[0] is NULL, preserving the design that control creation errors are caught at the end when the driver checks hdl->error. Also update function documentation in include/media/v4l2-ctrls.h. Fixes: 71c689dc2e73 ("media: v4l2-ctrls: split up into four source files") Cc: stable@vger.kernel.org Reported-by: syzbot+cf896de36144391bcde1@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=cf896de36144391bcde1 Suggested-by: Hans Verkuil Signed-off-by: Rohinthan P Signed-off-by: Hans Verkuil [hverkuil: simplified the v4l2_ctrl_auto_cluster code a bit] Signed-off-by: Sasha Levin --- drivers/media/v4l2-core/v4l2-ctrls-core.c | 12 ++++++++++-- include/media/v4l2-ctrls.h | 6 ++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c index 3f1003fb7b011..febb2ef0f0543 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -2020,7 +2020,10 @@ void v4l2_ctrl_cluster(unsigned ncontrols, struct v4l2_ctrl **controls) int i; /* The first control is the master control and it must not be NULL */ - if (WARN_ON(ncontrols == 0 || controls[0] == NULL)) + if (WARN_ON(ncontrols == 0)) + return; + + if (!controls[0]) return; for (i = 0; i < ncontrols; i++) { @@ -2042,8 +2045,13 @@ void v4l2_ctrl_auto_cluster(unsigned ncontrols, struct v4l2_ctrl **controls, u32 flag = 0; int i; + if (WARN_ON(ncontrols <= 1)) + return; + + if (!master) + return; + v4l2_ctrl_cluster(ncontrols, controls); - WARN_ON(ncontrols <= 1); WARN_ON(manual_val < master->minimum || manual_val > master->maximum); WARN_ON(set_volatile && !has_op(master, g_volatile_ctrl)); master->is_auto = true; diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index e59d9a234631d..ff42bbca4c084 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -796,6 +796,9 @@ bool v4l2_ctrl_radio_filter(const struct v4l2_ctrl *ctrl); * * @ncontrols: The number of controls in this cluster. * @controls: The cluster control array of size @ncontrols. + * + * If controls[0] is NULL, then this function does nothing and just + * returns. */ void v4l2_ctrl_cluster(unsigned int ncontrols, struct v4l2_ctrl **controls); @@ -807,6 +810,9 @@ void v4l2_ctrl_cluster(unsigned int ncontrols, struct v4l2_ctrl **controls); * @ncontrols: The number of controls in this cluster. * @controls: The cluster control array of size @ncontrols. The first control * must be the 'auto' control (e.g. autogain, autoexposure, etc.) + * + * If controls[0] is NULL, then this function does nothing and just + * returns. * @manual_val: The value for the first control in the cluster that equals the * manual setting. * @set_volatile: If true, then all controls except the first auto control will -- 2.53.0