mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
drm/plane: Move range check for format_count earlier
[ Upstream commit 4b674dd697
]
While the check for format_count > 64 in __drm_universal_plane_init()
shouldn't be hit (it's a WARN_ON), in its current position it will then
leak the plane->format_types array and fail to call
drm_mode_object_unregister() leaking the modeset identifier. Move it to
the start of the function to avoid allocating those resources in the
first place.
Signed-off-by: Steven Price <steven.price@arm.com>
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Link: https://lore.kernel.org/dri-devel/20211203102815.38624-1-steven.price@arm.com/
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
804e5bea5b
commit
787163d19b
1 changed files with 7 additions and 7 deletions
|
@ -249,6 +249,13 @@ static int __drm_universal_plane_init(struct drm_device *dev,
|
|||
if (WARN_ON(config->num_total_plane >= 32))
|
||||
return -EINVAL;
|
||||
|
||||
/*
|
||||
* First driver to need more than 64 formats needs to fix this. Each
|
||||
* format is encoded as a bit and the current code only supports a u64.
|
||||
*/
|
||||
if (WARN_ON(format_count > 64))
|
||||
return -EINVAL;
|
||||
|
||||
WARN_ON(drm_drv_uses_atomic_modeset(dev) &&
|
||||
(!funcs->atomic_destroy_state ||
|
||||
!funcs->atomic_duplicate_state));
|
||||
|
@ -270,13 +277,6 @@ static int __drm_universal_plane_init(struct drm_device *dev,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/*
|
||||
* First driver to need more than 64 formats needs to fix this. Each
|
||||
* format is encoded as a bit and the current code only supports a u64.
|
||||
*/
|
||||
if (WARN_ON(format_count > 64))
|
||||
return -EINVAL;
|
||||
|
||||
if (format_modifiers) {
|
||||
const uint64_t *temp_modifiers = format_modifiers;
|
||||
|
||||
|
|
Loading…
Reference in a new issue