| @@ -3094,6 +3094,9 @@ struct drm_property *drm_property_create(struct drm_device *dev, int flags, · 3093 unmodified lines |
| 3094 | 3094 | } |
| 3095 | 3095 | |
| 3096 | 3096 | list_add_tail(&property->head, &dev->mode_config.property_list); |
| 3097 | + |
| 3098 | + WARN_ON(!drm_property_type_valid(property)); |
| 3099 | + |
| 3097 | 3100 | return property; |
| 3098 | 3101 | fail: |
| 3099 | 3102 | kfree(property->values); |
| @@ -3251,14 +3254,16 @@ int drm_property_add_enum(struct drm_property *property, int index, · 151 unmodified lines |
| 3251 | 3254 | { |
| 3252 | 3255 | struct drm_property_enum *prop_enum; |
| 3253 | 3256 | |
| 3254 | | − if (!(property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK))) |
| 3257 | + if (!(drm_property_type_is(property, DRM_MODE_PROP_ENUM) || |
| 3258 | + drm_property_type_is(property, DRM_MODE_PROP_BITMASK))) |
| 3255 | 3259 | return -EINVAL; |
| 3256 | 3260 | |
| 3257 | 3261 | /* |
| 3258 | 3262 | * Bitmask enum properties have the additional constraint of values |
| 3259 | 3263 | * from 0 to 63 |
| 3260 | 3264 | */ |
| 3261 | | − if ((property->flags & DRM_MODE_PROP_BITMASK) && (value > 63)) |
| 3265 | + if (drm_property_type_is(property, DRM_MODE_PROP_BITMASK) && |
| 3266 | + (value > 63)) |
| 3262 | 3267 | return -EINVAL; |
| 3263 | 3268 | |
| 3264 | 3269 | if (!list_empty(&property->enum_blob_list)) { |
| @@ -3439,10 +3444,11 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, · 174 unmodified lines |
| 3439 | 3444 | goto done; |
| 3440 | 3445 | } |
| 3441 | 3446 | |
| 3442 | | − if (property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) { |
| 3447 | + if (drm_property_type_is(property, DRM_MODE_PROP_ENUM) || |
| 3448 | + drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) { |
| 3443 | 3449 | list_for_each_entry(prop_enum, &property->enum_blob_list, head) |
| 3444 | 3450 | enum_count++; |
| 3445 | | − } else if (property->flags & DRM_MODE_PROP_BLOB) { |
| 3451 | + } else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) { |
| 3446 | 3452 | list_for_each_entry(prop_blob, &property->enum_blob_list, head) |
| 3447 | 3453 | blob_count++; |
| 3448 | 3454 | } |
| @@ -3464,7 +3470,8 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, · 15 unmodified lines |
| 3464 | 3470 | } |
| 3465 | 3471 | out_resp->count_values = value_count; |
| 3466 | 3472 | |
| 3467 | | − if (property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) { |
| 3473 | + if (drm_property_type_is(property, DRM_MODE_PROP_ENUM) || |
| 3474 | + drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) { |
| 3468 | 3475 | if ((out_resp->count_enum_blobs >= enum_count) && enum_count) { |
| 3469 | 3476 | copied = 0; |
| 3470 | 3477 | enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr; |
| @@ -3486,7 +3493,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, · 15 unmodified lines |
| 3486 | 3493 | out_resp->count_enum_blobs = enum_count; |
| 3487 | 3494 | } |
| 3488 | 3495 | |
| 3489 | | − if (property->flags & DRM_MODE_PROP_BLOB) { |
| 3496 | + if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) { |
| 3490 | 3497 | if ((out_resp->count_enum_blobs >= blob_count) && blob_count) { |
| 3491 | 3498 | copied = 0; |
| 3492 | 3499 | blob_id_ptr = (uint32_t __user *)(unsigned long)out_resp->enum_blob_ptr; |
| @@ -3640,17 +3647,18 @@ static bool drm_property_change_is_valid(struct drm_property *property, · 147 unmodified lines |
| 3640 | 3647 | { |
| 3641 | 3648 | if (property->flags & DRM_MODE_PROP_IMMUTABLE) |
| 3642 | 3649 | return false; |
| 3643 | | − if (property->flags & DRM_MODE_PROP_RANGE) { |
| 3650 | + |
| 3651 | + if (drm_property_type_is(property, DRM_MODE_PROP_RANGE)) { |
| 3644 | 3652 | if (value < property->values[0] || value > property->values[1]) |
| 3645 | 3653 | return false; |
| 3646 | 3654 | return true; |
| 3647 | | − } else if (property->flags & DRM_MODE_PROP_BITMASK) { |
| 3655 | + } else if (drm_property_type_is(property, DRM_MODE_PROP_BITMASK)) { |
| 3648 | 3656 | int i; |
| 3649 | 3657 | uint64_t valid_mask = 0; |
| 3650 | 3658 | for (i = 0; i < property->num_values; i++) |
| 3651 | 3659 | valid_mask |= (1ULL << property->values[i]); |
| 3652 | 3660 | return !(value & ~valid_mask); |
| 3653 | | − } else if (property->flags & DRM_MODE_PROP_BLOB) { |
| 3661 | + } else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) { |
| 3654 | 3662 | /* Only the driver knows */ |
| 3655 | 3663 | return true; |
| 3656 | 3664 | } else { |