Commit 439cf34c authored by Ville Syrjälä's avatar Ville Syrjälä

drm/atomic: Don't pollute crtc_state->mode_blob with error pointers

Make sure we don't assign an error pointer to crtc_state->mode_blob
as that will break all kinds of places that assume either NULL or a
valid pointer (eg. drm_property_blob_put()).

Cc: stable@vger.kernel.org
Reported-by: default avatarfuyufan <fuyufan@huawei.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220209091928.14766-1-ville.syrjala@linux.intel.comAcked-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent 59f39bfa
...@@ -76,15 +76,17 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state, ...@@ -76,15 +76,17 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state,
state->mode_blob = NULL; state->mode_blob = NULL;
if (mode) { if (mode) {
struct drm_property_blob *blob;
drm_mode_convert_to_umode(&umode, mode); drm_mode_convert_to_umode(&umode, mode);
state->mode_blob = blob = drm_property_create_blob(crtc->dev,
drm_property_create_blob(state->crtc->dev, sizeof(umode), &umode);
sizeof(umode), if (IS_ERR(blob))
&umode); return PTR_ERR(blob);
if (IS_ERR(state->mode_blob))
return PTR_ERR(state->mode_blob);
drm_mode_copy(&state->mode, mode); drm_mode_copy(&state->mode, mode);
state->mode_blob = blob;
state->enable = true; state->enable = true;
drm_dbg_atomic(crtc->dev, drm_dbg_atomic(crtc->dev,
"Set [MODE:%s] for [CRTC:%d:%s] state %p\n", "Set [MODE:%s] for [CRTC:%d:%s] state %p\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment