From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 60483446AC; Mon, 1 Apr 2024 16:11:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987886; cv=none; b=Urn4yBOQWgBm/AzdJQMJzSZlXwDTQOLvjXPM7lfZO0dYIlvwE3BDk21h5hKiURGhMX/6R4XxY4gxTJ6d2QhOJBDSAFPVrmmMZzCm1Jx1tltvcMugLW/6JDLelNM9TRZxywNkzozkXGQ1HGfhioxGuJ3kYzjXunwNtB0pdzxeVss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987886; c=relaxed/simple; bh=1Ex73Aa90E793YcheNSEeI8zPETxYDaZIhDxibfaz/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lz3EkoiLqsyQVYnDh7zAYXEPTQtqu9GlbV1PPbFxVPr/Vmx01vgYg4iMPtWEGrOrI/Voq6FThxpkLSvm2zT6ckc4SzW6ZKXU4jKxEnoltjl7B9gZambES4aT3moCW6ZhQgbdnT45sLSOzn7et2JBB3hxaHjvbzXCZkxQzf1WsdA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hQ2HgJ1b; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hQ2HgJ1b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83C7BC433F1; Mon, 1 Apr 2024 16:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711987886; bh=1Ex73Aa90E793YcheNSEeI8zPETxYDaZIhDxibfaz/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQ2HgJ1bN9HDxQxUO4YhljxZ8/Qg48Z2Uv9EPlFD2eOhdi0aFTmLUFS+sLBegleZk lHsMIWnSAjb8VaaOkZsmCu25dtYrzNjNSJfpnmuOjPaNFcUP/eY28DayzA/tfm2HtW nGVwnBa9gxUMGCl2NMEvTPCEWZj4GpXfCft1PQJk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Vasut , Kieran Bingham , Fabio Estevam , Laurent Pinchart , Sakari Ailus , Hans Verkuil , Sasha Levin Subject: [PATCH 6.7 021/432] media: nxp: imx8-isi: Check whether crossbar pad is non-NULL before access Date: Mon, 1 Apr 2024 17:40:08 +0200 Message-ID: <20240401152553.761778601@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152553.125349965@linuxfoundation.org> References: <20240401152553.125349965@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Vasut [ Upstream commit eb2f932100288dbb881eadfed02e1459c6b9504c ] When translating source to sink streams in the crossbar subdev, the driver tries to locate the remote subdev connected to the sink pad. The remote pad may be NULL, if userspace tries to enable a stream that ends at an unconnected crossbar sink. When that occurs, the driver dereferences the NULL pad, leading to a crash. Prevent the crash by checking if the pad is NULL before using it, and return an error if it is. Cc: stable@vger.kernel.org # 6.1 Fixes: cf21f328fcaf ("media: nxp: Add i.MX8 ISI driver") Signed-off-by: Marek Vasut Reviewed-by: Kieran Bingham Reviewed-by: Fabio Estevam Reviewed-by: Laurent Pinchart Link: https://lore.kernel.org/r/20231201150614.63300-1-marex@denx.de Signed-off-by: Laurent Pinchart Acked-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c index 792f031e032ae..44354931cf8a1 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c @@ -160,8 +160,14 @@ mxc_isi_crossbar_xlate_streams(struct mxc_isi_crossbar *xbar, } pad = media_pad_remote_pad_first(&xbar->pads[sink_pad]); - sd = media_entity_to_v4l2_subdev(pad->entity); + if (!pad) { + dev_dbg(xbar->isi->dev, + "no pad connected to crossbar input %u\n", + sink_pad); + return ERR_PTR(-EPIPE); + } + sd = media_entity_to_v4l2_subdev(pad->entity); if (!sd) { dev_dbg(xbar->isi->dev, "no entity connected to crossbar input %u\n", -- 2.43.0