From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>, Eric Anholt <eric@anholt.net>
Cc: linux-arm-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
dri-devel@lists.freedesktop.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH v4 3/8] drm/vc4: hdmi: Don't access the connector state in reset if kmalloc fails
Date: Mon, 7 Dec 2020 14:39:43 +0100 [thread overview]
Message-ID: <20201207133948.2109194-4-maxime@cerno.tech> (raw)
In-Reply-To: <20201207133948.2109194-1-maxime@cerno.tech>
drm_atomic_helper_connector_reset uses kmalloc which, from an API
standpoint, can fail, and thus setting connector->state to NULL.
However, our reset hook then calls drm_atomic_helper_connector_tv_reset
that will access connector->state without checking if it's a valid
pointer or not.
Make sure we don't end up accessing a NULL pointer.
Suggested-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 5a608ed1d75e..112c09873eb4 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -171,7 +171,9 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
static void vc4_hdmi_connector_reset(struct drm_connector *connector)
{
drm_atomic_helper_connector_reset(connector);
- drm_atomic_helper_connector_tv_reset(connector);
+
+ if (connector->state)
+ drm_atomic_helper_connector_tv_reset(connector);
}
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
--
2.28.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-07 13:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 13:39 [PATCH v4 0/8] drm/vc4: hdmi: Support the 10/12 bit output Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 1/8] drm/vc4: hvs: Align the HVS atomic hooks to the new API Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 2/8] drm/vc4: Pass the atomic state to encoder hooks Maxime Ripard
2020-12-07 14:16 ` Thomas Zimmermann
2020-12-07 15:56 ` Maxime Ripard
2020-12-07 13:39 ` Maxime Ripard [this message]
2020-12-07 14:05 ` [PATCH v4 3/8] drm/vc4: hdmi: Don't access the connector state in reset if kmalloc fails Thomas Zimmermann
2020-12-07 13:39 ` [PATCH v4 4/8] drm/vc4: hdmi: Create a custom connector state Maxime Ripard
2020-12-07 14:07 ` Thomas Zimmermann
2020-12-07 13:39 ` [PATCH v4 5/8] drm/vc4: hdmi: Store pixel frequency in the " Maxime Ripard
2020-12-07 14:14 ` Thomas Zimmermann
2020-12-07 15:44 ` Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 6/8] drm/vc4: hdmi: Use the connector state pixel rate for the PHY Maxime Ripard
2020-12-07 14:20 ` Thomas Zimmermann
2020-12-07 13:39 ` [PATCH v4 7/8] drm/vc4: hdmi: Limit the BCM2711 to the max without scrambling Maxime Ripard
2020-12-07 13:39 ` [PATCH v4 8/8] drm/vc4: hdmi: Enable 10/12 bpc output Maxime Ripard
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=20201207133948.2109194-4-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--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