From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jani Nikula <jani.nikula@intel.com>,
Iaroslav Boliukin <iam@lach.pw>,
Dmitry Osipenko <dmitry.osipenko@collabora.com>,
Sasha Levin <sashal@kernel.org>,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch,
dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 6.2 01/37] drm/displayid: add displayid_get_header() and check bounds better
Date: Sun, 30 Apr 2023 22:59:09 -0400 [thread overview]
Message-ID: <20230501025945.3253774-1-sashal@kernel.org> (raw)
From: Jani Nikula <jani.nikula@intel.com>
[ Upstream commit 5bacecc3c56131c31f18b23d366f2184328fd9cf ]
Add a helper to get a pointer to struct displayid_header. To be
pedantic, add buffer overflow checks to not touch the base if that
itself would overflow.
Cc: Iaroslav Boliukin <iam@lach.pw>
Cc: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4a03b3a5132642d3cdb6d4c2641422955a917292.1676580180.git.jani.nikula@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/drm_displayid.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c
index 38ea8203df45b..7d03159dc1461 100644
--- a/drivers/gpu/drm/drm_displayid.c
+++ b/drivers/gpu/drm/drm_displayid.c
@@ -7,13 +7,28 @@
#include <drm/drm_edid.h>
#include <drm/drm_print.h>
+static const struct displayid_header *
+displayid_get_header(const u8 *displayid, int length, int index)
+{
+ const struct displayid_header *base;
+
+ if (sizeof(*base) > length - index)
+ return ERR_PTR(-EINVAL);
+
+ base = (const struct displayid_header *)&displayid[index];
+
+ return base;
+}
+
static int validate_displayid(const u8 *displayid, int length, int idx)
{
int i, dispid_length;
u8 csum = 0;
const struct displayid_header *base;
- base = (const struct displayid_header *)&displayid[idx];
+ base = displayid_get_header(displayid, length, idx);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
DRM_DEBUG_KMS("base revision 0x%x, length %d, %d %d\n",
base->rev, base->bytes, base->prod_id, base->ext_count);
--
2.39.2
next reply other threads:[~2023-05-01 3:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-01 2:59 Sasha Levin [this message]
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 02/37] drm/amd/display: populate subvp cmd info only for the top pipe Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 03/37] drm/amd/display: Correct DML calculation to align HW formula Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 04/37] drm/amd/display: enable DPG when disabling plane for phantom pipe Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 05/37] platform/x86: x86-android-tablets: Add Acer Iconia One 7 B1-750 data Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 06/37] drm/amd/display: Enable HostVM based on rIOMMU active Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 07/37] drm/amd/display: Use DC_LOG_DC in the trasform pixel function Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 08/37] regmap: cache: Return error in cache sync operations for REGCACHE_NONE Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 09/37] remoteproc: imx_dsp_rproc: Add custom memory copy implementation for i.MX DSP Cores Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 10/37] arm64: dts: qcom: msm8996: Add missing DWC3 quirks Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 11/37] accel/habanalabs: postpone mem_mgr IDR destruction to hpriv_release() Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 12/37] media: imx-jpeg: Bounds check sizeimage access Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 13/37] media: cx23885: Fix a null-ptr-deref bug in buffer_prepare() and buffer_finish() Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 14/37] media: pci: tw68: Fix null-ptr-deref bug in buf prepare and finish Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 15/37] media: pvrusb2: VIDEO_PVRUSB2 depends on DVB_CORE to use dvb_* symbols Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 16/37] ACPI: processor: Check for null return of devm_kzalloc() in fch_misc_setup() Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 17/37] drm/rockchip: dw_hdmi: cleanup drm encoder during unbind Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 18/37] memstick: r592: Fix UAF bug in r592_remove due to race condition Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 19/37] arm64: dts: imx8mq-librem5: Remove dis_u3_susphy_quirk from usb_dwc3_0 Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 20/37] firmware: arm_sdei: Fix sleep from invalid context BUG Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 21/37] ACPI: EC: Fix oops when removing custom query handlers Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 22/37] drm/amd/display: fixed dcn30+ underflow issue Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 23/37] remoteproc: stm32_rproc: Add mutex protection for workqueue Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 24/37] drm/tegra: Avoid potential 32-bit integer overflow Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 25/37] drm/msm/dp: Clean up handling of DP AUX interrupts Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 26/37] ACPICA: Avoid undefined behavior: applying zero offset to null pointer Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 27/37] ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 28/37] arm64: dts: qcom: sdm845-polaris: Drop inexistent properties Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 29/37] irqchip/gicv3: Workaround for NVIDIA erratum T241-FABRIC-4 Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 30/37] media: cros-ec-cec: Don't exit early in .remove() callback Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 31/37] ACPI: video: Remove desktops without backlight DMI quirks Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 32/37] drm/amd/display: Correct DML calculation to follow HW SPEC Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 33/37] drm/amd: Fix an out of bounds error in BIOS parser Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 34/37] drm/amdgpu: Fix sdma v4 sw fini error Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 35/37] media: Prefer designated initializers over memset for subdev pad ops Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 36/37] drm/amdgpu: Enable IH retry CAM on GFX9 Sasha Levin
2023-05-01 2:59 ` [PATCH AUTOSEL 6.2 37/37] media: mediatek: vcodec: Fix potential array out-of-bounds in decoder queue_setup Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230501025945.3253774-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.osipenko@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=iam@lach.pw \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).