diff options
| author | Ming Qian | 2023-07-18 17:50:13 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2023-09-13 09:42:51 +0200 |
| commit | b4ee61e5a11004d5df8d0582f460dd537153405a (patch) | |
| tree | 6708b331d2a557133ce9a2fc19b5c11fbc80344d /drivers | |
| parent | 932d84a8a808bc8f4eed85335fdafce119a60ddd (diff) | |
media: amphion: ensure the bitops don't cross boundaries
[ Upstream commit 5bd28eae48589694ff4e5badb03bf75dae695b3f ]
the supported_instance_count determine the instance index range,
it shouldn't exceed the bits number of instance_mask,
otherwise the bitops of instance_mask may cross boundaries
Fixes: 9f599f351e86 ("media: amphion: add vpu core driver")
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Ming Qian <ming.qian@nxp.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/amphion/vpu_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c index be8041068268..9add73b9b45f 100644 --- a/drivers/media/platform/amphion/vpu_core.c +++ b/drivers/media/platform/amphion/vpu_core.c @@ -88,6 +88,8 @@ static int vpu_core_boot_done(struct vpu_core *core) core->supported_instance_count = min(core->supported_instance_count, count); } + if (core->supported_instance_count >= BITS_PER_TYPE(core->instance_mask)) + core->supported_instance_count = BITS_PER_TYPE(core->instance_mask); core->fw_version = fw_version; vpu_core_set_state(core, VPU_CORE_ACTIVE); |