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 497C9261572; Thu, 3 Apr 2025 19:20:29 +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=1743708029; cv=none; b=Wjp7cpTdaZPYfsOy1M9+Qi3lnHJNuTU5OljCOHr1InUxRPUmmU2VkvXBPuT5opzLImZdl7NzBNG4hqiIr3ENiOkDn4e2pzS2P4g+QKPEP4UTU+Xog8i6AsBJ5w7aIU3676omeg6sMowK4U1WnjDdvvk16G47SnNTTeyQRWo2rNw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743708029; c=relaxed/simple; bh=pCmyw+57uV8ZJYghvhdI5iLMyESg4RzTGJujrEavo5Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FQisYgNGE/LcFCmnoe14s220xZL5eV0hCmWiEsazmK9Ndsn1XL2IxGrLX/ovaAmLjQ9GgvQwsgcFEsTJzUoM0tolh+aybQjUgaIEghkpjAr/aamiSMp0dVBIuwcSzvqVCRorJBwvD9DgnD3Q/ZIbFOO+WH/VldGI8nc+/tVIjtw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Wmr4+Fmc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wmr4+Fmc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA034C4CEE8; Thu, 3 Apr 2025 19:20:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743708029; bh=pCmyw+57uV8ZJYghvhdI5iLMyESg4RzTGJujrEavo5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wmr4+FmcrjSLwqdmdzwJxfp0MxZUTKflrssfENjHj8RgZCIFMj4Se52yFUSQKlPz8 kH0KA3F9DCqe3e1FMdOUhR3YEoRD/5paVmMwpNvFkBhaONLLS/wOukpIdMUUo/xJNU i6OjKu7U4mIIj2drBnzvV1K4G8ZJjhMbXtmqrs/71pDw3OXlldEjRgoFdI+MDqKOzf laPCph2w0StvJ+yNyXqFo+ZNU5Y82kAuaKIzw3k6Z6UEawdt5+eE5XZ289G/+heHg8 jFNi7i1X/B7ffY/6diWDVZ6qqy5M6SCpYcFA+/CDXVOU26bFVeCDZPi9UeEAlKSlgL yEBcgmhNWJwjw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Leonid Arapov , Helge Deller , Sasha Levin , krzysztof.kozlowski@linaro.org, linux@treblig.org, u.kleine-koenig@baylibre.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 11/12] fbdev: omapfb: Add 'plane' value check Date: Thu, 3 Apr 2025 15:20:00 -0400 Message-Id: <20250403192001.2682149-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403192001.2682149-1-sashal@kernel.org> References: <20250403192001.2682149-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.179 Content-Transfer-Encoding: 8bit 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 b2d6e6df21615..d852bef1d507f 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c @@ -2751,9 +2751,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