mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/client: Fully protect modes[] with dev->mode_config.mutex

Browse source 
The modes[] array contains pointers to modes on the connectors'
mode lists, which are protected by dev->mode_config.mutex.
Thus we need to extend modes[] the same protection or by the
time we use it the elements may already be pointing to
freed/reused memory.

Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10583
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240404203336.10454-2-ville.syrjala@linux.intel.com
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
This commit is contained in:
Ville Syrjälä 2024-04-04 23:33:25 +03:00
parent 8ab58f6841
commit 3eadd887db
1 changed files with 2 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/drm_client_modeset.c
View file

@ -777,6 +777,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
unsigned int total_modes_count = 0; unsigned int total_modes_count = 0;
struct drm_client_offset *offsets; struct drm_client_offset *offsets;
unsigned int connector_count = 0; unsigned int connector_count = 0;
/* points to modes protected by mode_config.mutex */
struct drm_display_mode **modes; struct drm_display_mode **modes;
struct drm_crtc **crtcs; struct drm_crtc **crtcs;
int i, ret = 0; int i, ret = 0;
@ -845,7 +846,6 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
drm_client_pick_crtcs(client, connectors, connector_count, drm_client_pick_crtcs(client, connectors, connector_count,
crtcs, modes, 0, width, height); crtcs, modes, 0, width, height);
} }
mutex_unlock(&dev->mode_config.mutex);
drm_client_modeset_release(client); drm_client_modeset_release(client);
@ -875,6 +875,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width,
modeset->y = offset->y; modeset->y = offset->y;
} }
} }
mutex_unlock(&dev->mode_config.mutex);
mutex_unlock(&client->modeset_mutex); mutex_unlock(&client->modeset_mutex);
out: out: