Unverified Commit 5624ca70 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15577 drm/plane: Move range check for format_count earlier 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Wensheng <wangwensheng4@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/45F7KNH5G4SLDYOVHS3N3XSMDFLKSLHQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP6CD 
 
Link:https://gitee.com/openeuler/kernel/pulls/15577

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents c052210a faa08b86

drivers/gpu/drm/drm_plane.c

+7 −7
Original line number Diff line number Diff line
@@ -177,6 +177,13 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, 
	if (WARN_ON(config->num_total_plane >= 32))

		return -EINVAL;



	/*

	 * First driver to need more than 64 formats needs to fix this. Each

	 * format is encoded as a bit and the current code only supports a u64.

	 */

	if (WARN_ON(format_count > 64))

		return -EINVAL;



	WARN_ON(drm_drv_uses_atomic_modeset(dev) &&

		(!funcs->atomic_destroy_state ||

		 !funcs->atomic_duplicate_state));
@@ -198,13 +205,6 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, 
		return -ENOMEM;

	}



	/*

	 * First driver to need more than 64 formats needs to fix this. Each

	 * format is encoded as a bit and the current code only supports a u64.

	 */

	if (WARN_ON(format_count > 64))

		return -EINVAL;



	if (format_modifiers) {

		const uint64_t *temp_modifiers = format_modifiers;

		while (*temp_modifiers++ != DRM_FORMAT_MOD_INVALID)