Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v2 1/2] drm: Add a locked version of drm_is_current_master
To:     maarten.lankhorst@linux.intel.com, mripard@kernel.org,
        tzimmermann@suse.de, airlied@linux.ie,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        skhan@linuxfoundation.org, gregkh@linuxfoundation.org,
        linux-kernel-mentees@lists.linuxfoundation.org,
        emil.l.velikov@gmail.com
References: <20210615023645.6535-1-desmondcheongzx@gmail.com>
 <20210615023645.6535-2-desmondcheongzx@gmail.com>
 <YMuAYaZF+qW7GUFT@phenom.ffwll.local>
From:   Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
Message-ID: <793cf08c-a766-637e-b473-91f6c8de12ec@gmail.com>
Date:   Fri, 18 Jun 2021 10:54:58 +0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.8.1
MIME-Version: 1.0
In-Reply-To: <YMuAYaZF+qW7GUFT@phenom.ffwll.local>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 18/6/21 1:03 am, Daniel Vetter wrote:
> On Tue, Jun 15, 2021 at 10:36:44AM +0800, Desmond Cheong Zhi Xi wrote:
>> While checking the master status of the DRM file in
>> drm_is_current_master(), the device's master mutex should be
>> held. Without the mutex, the pointer fpriv->master may be freed
>> concurrently by another process calling drm_setmaster_ioctl(). This
>> could lead to use-after-free errors when the pointer is subsequently
>> dereferenced in drm_lease_owner().
>>
>> The callers of drm_is_current_master() from drm_auth.c hold the
>> device's master mutex, but external callers do not. Hence, we implement
>> drm_is_current_master_locked() to be used within drm_auth.c, and
>> modify drm_is_current_master() to grab the device's master mutex
>> before checking the master status.
>>
>> Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>> Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>
>> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
>> ---
>>   drivers/gpu/drm/drm_auth.c | 23 +++++++++++++++++++----
>>   1 file changed, 19 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c
>> index 232abbba3686..c6bf52c310a9 100644
>> --- a/drivers/gpu/drm/drm_auth.c
>> +++ b/drivers/gpu/drm/drm_auth.c
>> @@ -61,6 +61,8 @@
>>    * trusted clients.
>>    */
>>   
>> +static bool drm_is_current_master_locked(struct drm_file *fpriv);
> 
> A bit a bikeshed, but we try to avoid forward declarations when they're
> not needed. If you don't want to tear apart drm_is_current_master and the
> _locked version then just move them together.
> 
> Can you pls do that and respin?
> 
> Otherwise looks all great.
> -Daniel
> 
> 

Yeah, I was trying to keep the logic in _locked close to 
drm_is_current_master. But got it, will do.