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=1795052341; b=RQK/+Lk/oaPatMdwXVHqPTepwU2nEBYgYQK5LBT9QqjRFFEkKqslMl6ytiXMbaSZ8737 nW8m3/U6DEsRMKYtwgLWrq1qc7grfWxhzYojfBviBZ+3Gdu32W8OE0vsFAeU4BaBOs4I/ c1HT+0romTG/WBAkvwmiCdMO+JvRfbzVoOCLMCCFRFTtLS2o2WgzgxQlwvKRNctTAiiPP vmzK5bkIUCVCvY1K/8RqtQFHCnQtcqlTgBLADjwnKUcLKv7BLBLRZQa5VW8tSZUXPhk2X 8+d9rEIHSrJY2EBnT/QEiIHizwUtx1JmaLpGqUVcKsvL5yXbJ7wGNrSfw10a1SFBLLw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795052341; 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=wYEeKp5WwESH2KIcRTuU0Jkcso4PHjaGyHvEbkNrgz8=; b=bXho+wSX7GVeGDwxpuF5OQiAL6n7WTt89SdclN3nJWSCtZ3TwqAGn3GDXZfVY5lvJkjF 3iAS0Nd7/Dm+n9vovpEj4cdGPQ595Yy+ODZnOROWsgeNF4pQ9Mni/J331ptAvFFhaOXux rTTHGwaNJJGY1sKZ0qJ2Oj6QrT7fnQJ0LK3X+PGIwJVe2ev3dXslf5esfKYoNfAuHdJNE wcJu4NP/CNInF6LOzu1bJILYFsVkQ1wLiJK69RuSt2YYNfcmk3DqC9aNBTd7Q7G68EkQQ HHo/THyxkFYvTo/XYDJmgwCFnmRkNFirm2qcIlx1rlpLEbazHpYi4Dcuw6eqHRsn8Jw== 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=IRhkzK5B; 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 C12EA60A2625; Thu, 19 Nov 2026 01:39:01 +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=IRhkzK5B Received: by smtp.kernel.org (Postfix) with ESMTPSA id 236791F000CA; Thu, 19 Nov 2026 01:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795052341; bh=wYEeKp5WwESH2KIcRTuU0Jkcso4PHjaGyHvEbkNrgz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IRhkzK5BieKRBRBkvqzYrI3zGWx4kPX9tqjUSDS8HlUqZH2L5JEzobT8hKyjCbQdN ZxWoDtSGNUGNw6WAV+8pGC6abRnVIX0pG9IEqv+3cOwEVX8cNZx4ODcic7cWglRJsp Un4n7mI2dmTEQTsem9QXm43zidcUnx1dskV+BzmE= 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 5.15 0522/2214] media: v4l2-ctrls: do nothing if controls[0] == NULL in cluster functions Date: Wed, 18 Nov 2026 15:36:38 +0100 Message-ID: <20261118150031.964498475@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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 5.15-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 d1077844e5b08..5086b5e8c8559 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -1636,7 +1636,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++) { @@ -1658,8 +1661,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 575b59fbac779..0e47ccc5a6fc8 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -773,6 +773,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); @@ -784,6 +787,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