lkml.org 
[lkml]   [2023]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.6 17/40] drm_lease.c: copy user-array safely
    Date
    From: Philipp Stanner <pstanner@redhat.com>

    [ Upstream commit f37d63e219c39199a59b8b8a211412ff27192830 ]

    Currently, there is no overflow-check with memdup_user().

    Use the new function memdup_array_user() instead of memdup_user() for
    duplicating the user-space array safely.

    Suggested-by: David Airlie <airlied@redhat.com>
    Signed-off-by: Philipp Stanner <pstanner@redhat.com>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Zack Rusin <zackr@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-6-pstanner@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/drm_lease.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
    index 150fe15550680..94375c6a54256 100644
    --- a/drivers/gpu/drm/drm_lease.c
    +++ b/drivers/gpu/drm/drm_lease.c
    @@ -510,8 +510,8 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
    /* Handle leased objects, if any */
    idr_init(&leases);
    if (object_count != 0) {
    - object_ids = memdup_user(u64_to_user_ptr(cl->object_ids),
    - array_size(object_count, sizeof(__u32)));
    + object_ids = memdup_array_user(u64_to_user_ptr(cl->object_ids),
    + object_count, sizeof(__u32));
    if (IS_ERR(object_ids)) {
    ret = PTR_ERR(object_ids);
    idr_destroy(&leases);
    --
    2.42.0
    \
     
     \ /
      Last update: 2023-11-20 13:51    [W:2.335 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site