lkml.org 
[lkml]   [2022]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.17 054/135] drm/plane: Move range check for format_count earlier
    Date
    From: Steven Price <steven.price@arm.com>

    [ Upstream commit 4b674dd69701c2e22e8e7770c1706a69f3b17269 ]

    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>
    ---
    drivers/gpu/drm/drm_plane.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
    index 82afb854141b..fd0bf90fb4c2 100644
    --- a/drivers/gpu/drm/drm_plane.c
    +++ b/drivers/gpu/drm/drm_plane.c
    @@ -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;

    --
    2.35.1
    \
     
     \ /
      Last update: 2022-05-30 15:55    [W:4.043 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site