Commit f4c09994 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Cheng Yu
Browse files

drm/radeon: Fix encoder->possible_clones 

stable inclusion
from stable-v5.10.228
commit df75c78bfeff99f9b4815c3e79e2b1b1e34fe264
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2YX3
CVE: CVE-2024-50201

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=df75c78bfeff99f9b4815c3e79e2b1b1e34fe264



--------------------------------

commit 28127dba64d8ae1a0b737b973d6d029908599611 upstream.

Include the encoder itself in its possible_clones bitmask.
In the past nothing validated that drivers were populating
possible_clones correctly, but that changed in commit
74d2aacb ("drm: Validate encoder->possible_clones").
Looks like radeon never got the memo and is still not
following the rules 100% correctly.

This results in some warnings during driver initialization:
Bogus possible_clones: [ENCODER:46:TV-46] possible_clones=0x4 (full encoder mask=0x7)
WARNING: CPU: 0 PID: 170 at drivers/gpu/drm/drm_mode_config.c:615 drm_mode_config_validate+0x113/0x39c
...

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Fixes: 74d2aacb ("drm: Validate encoder->possible_clones")
Reported-by: default avatarErhard Furtner <erhard_f@mailbox.org>
Closes: https://lore.kernel.org/dri-devel/20241009000321.418e4294@yea/


Tested-by: default avatarErhard Furtner <erhard_f@mailbox.org>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 3b6e7d40649c0d75572039aff9d0911864c689db)
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarCheng Yu <serein.chengyu@huawei.com>
parent a1fd264a

drivers/gpu/drm/radeon/radeon_encoders.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static uint32_t radeon_encoder_clones(struct drm_encoder *encoder) 
	struct radeon_device *rdev = dev->dev_private;

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);

	struct drm_encoder *clone_encoder;

	uint32_t index_mask = 0;

	uint32_t index_mask = drm_encoder_mask(encoder);

	int count;



	/* DIG routing gets problematic */