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 9C46128DEE3; Wed, 23 Apr 2025 15:06:04 +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=1745420764; cv=none; b=eGEWLimFuq/pgagnuKdFPVchnyBeJXnhGUYGm7Q5BF8PxZITyFsD4cvEz2sbQRVUqZyCQsaof++Fs5JbrRz1BPVXtBZ5NOvEu85434mm0SQbsawYpHqBEV+kNPAs63Px/XMqo7T5l0VjmCqYjCQ5bo8MH/iOBPDM53ZOLxOuWmI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420764; c=relaxed/simple; bh=Vf7IK6EiZpEoUsCE4y8w2ItJBJBrUx8XYfa3LnsVw0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rKkYdQC1FZ6avbc92Oj48zRh5HrSddB13PiCsYUJTZj9NmhoKPohwcDJ4Mblz0pkzbsEs6zw9Hau0AswUOfaznBEYi/pITJEemumNdhEYwRQIBpoKLgDW/Ta41+poVJWR9rqXxlQA4kqFYeoZlaYmkha0NgQFIG4HiGc4lRePVI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kwoTVvpN; 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="kwoTVvpN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B5DEC4CEE2; Wed, 23 Apr 2025 15:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420764; bh=Vf7IK6EiZpEoUsCE4y8w2ItJBJBrUx8XYfa3LnsVw0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kwoTVvpNn/RFZZVe6f5df4ovMnYO74XoYpvZUB1oQXySN5Llv49jKGjNCwvlNxtuJ yn17tI7Vg0kKOgxQ/krONpbmiOrZC94ZtFqpvyu60kg+P9AbzLqfBYUx0dLfCwqEdK n9acjDaqFANYw6kPjSBVGdQwjOX81eSIr0IveciE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Leonid Arapov , Helge Deller , Sasha Levin Subject: [PATCH 6.6 110/393] fbdev: omapfb: Add plane value check Date: Wed, 23 Apr 2025 16:40:06 +0200 Message-ID: <20250423142647.824127686@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Leonid Arapov [ Upstream commit 3e411827f31db7f938a30a3c7a7599839401ec30 ] Function dispc_ovl_setup is not intended to work with the value OMAP_DSS_WB of the enum parameter plane. The value of this parameter is initialized in dss_init_overlays and in the current state of the code it cannot take this value so it's not a real problem. For the purposes of defensive coding it wouldn't be superfluous to check the parameter value, because some functions down the call stack process this value correctly and some not. For example, in dispc_ovl_setup_global_alpha it may lead to buffer overflow. Add check for this value. Found by Linux Verification Center (linuxtesting.org) with SVACE static analysis tool. Signed-off-by: Leonid Arapov Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c index 21fef9db90d26..4f09111f8b57e 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c @@ -2749,9 +2749,13 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, bool mem_to_mem) { int r; - enum omap_overlay_caps caps = dss_feat_get_overlay_caps(plane); + enum omap_overlay_caps caps; enum omap_channel channel; + if (plane == OMAP_DSS_WB) + return -EINVAL; + + caps = dss_feat_get_overlay_caps(plane); channel = dispc_ovl_get_channel_out(plane); DSSDBG("dispc_ovl_setup %d, pa %pad, pa_uv %pad, sw %d, %d,%d, %dx%d ->" -- 2.39.5