[PATCH] drm: Fix get_property logic fumble

Andres Rodriguez andresx7 at gmail.com
Thu Apr 13 20:44:19 UTC 2017



On 2017-04-10 08:40 AM, Maarten Lankhorst wrote:
> Op 10-04-17 om 13:54 schreef Daniel Vetter:
>> Yet again I've proven that I can't negate conditions :(
>>
>> Fixes: eb8eb02ed850 ("drm: Drop modeset_lock_all from the getproperty ioctl")
>> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>> Cc: Daniel Vetter <daniel.vetter at intel.com>
>> Cc: Jani Nikula <jani.nikula at linux.intel.com>
>> Cc: Sean Paul <seanpaul at chromium.org>
>> Reported-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
>> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
>> ---
>>  drivers/gpu/drm/drm_property.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c
>> index 3feef0659940..3e88fa24eab3 100644
>> --- a/drivers/gpu/drm/drm_property.c
>> +++ b/drivers/gpu/drm/drm_property.c
>> @@ -476,7 +476,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
>>  	    drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) {
>>  		list_for_each_entry(prop_enum, &property->enum_list, head) {
>>  			enum_count++;
>> -			if (out_resp->count_enum_blobs <= enum_count)
>> +			if (out_resp->count_enum_blobs < enum_count)
>>  				continue;
>>
>>  			if (copy_to_user(&enum_ptr[copied].value,
>
> Neither can I, glanced over it while looking why the bisect pointed at this commit.

Same.

Tested-by: Andres Rodriguez <andresx7 at gmail.com>

Fixes segfaults on xorg-video-amdgpu-1.1.2

>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>


More information about the dri-devel mailing list