Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <b0d778de-9be7-f1a0-9356-9daa398edf5e@gmail.com>
Date:   Thu, 23 Jun 2022 09:45:46 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.1
Subject: Re: [PATCH] gpu: drm: fix possible memory leak in drm_addmap_core()
Content-Language: en-US
From:   Hangyu Hua <hbh25y@gmail.com>
To:     maarten.lankhorst@linux.intel.com, mripard@kernel.org,
        tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch
Cc:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20220509054441.17282-1-hbh25y@gmail.com>
 <ea67fa6b-0fcd-4b59-861f-360e74a4d70a@gmail.com>
In-Reply-To: <ea67fa6b-0fcd-4b59-861f-360e74a4d70a@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 2022/5/23 09:57, Hangyu Hua wrote:
> On 2022/5/9 13:44, Hangyu Hua wrote:
>> map->handle need to be handled correctly when map->type is _DRM_SHM or
>> _DRM_CONSISTENT just like map->type is _DRM_REGISTERS.
>>
>> Fixes: 8d153f7107ff ("drm: update user token hashing and map handles")
>> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
>> ---
>>   drivers/gpu/drm/drm_bufs.c | 18 ++++++++++++++++++
>>   1 file changed, 18 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
>> index fcca21e8efac..2b3f504c5f9c 100644
>> --- a/drivers/gpu/drm/drm_bufs.c
>> +++ b/drivers/gpu/drm/drm_bufs.c
>> @@ -344,6 +344,15 @@ static int drm_addmap_core(struct drm_device 
>> *dev, resource_size_t offset,
>>       if (!list) {
>>           if (map->type == _DRM_REGISTERS)
>>               iounmap(map->handle);
>> +        else if (map->type == _DRM_SHM) {
>> +            dev->sigdata.lock = dev->master->lock.hw_lock = NULL;
>> +            vfree(map->handle);
>> +        } else if (map->type == _DRM_CONSISTENT) {
>> +            dma_free_coherent(dev->dev,
>> +                      map->size,
>> +                      map->handle,
>> +                      map->offset);
>> +        }
>>           kfree(map);
>>           return -EINVAL;
>>       }
>> @@ -361,6 +370,15 @@ static int drm_addmap_core(struct drm_device 
>> *dev, resource_size_t offset,
>>       if (ret) {
>>           if (map->type == _DRM_REGISTERS)
>>               iounmap(map->handle);
>> +        else if (map->type == _DRM_SHM) {
>> +            dev->sigdata.lock = dev->master->lock.hw_lock = NULL;
>> +            vfree(map->handle);
>> +        } else if (map->type == _DRM_CONSISTENT) {
>> +            dma_free_coherent(dev->dev,
>> +                      map->size,
>> +                      map->handle,
>> +                      map->offset);
>> +        }
>>           kfree(map);
>>           kfree(list);
>>           mutex_unlock(&dev->struct_mutex);
> 
> Gentel ping.

Gentel ping.