From: Colin Ian King colin.king@canonical.com
There are two occurrances of off-by-one upper bound checking of indexes causing potential out-of-bounds array reads. Fix these.
Addresses-Coverity: ("Out-of-bounds read") Fixes: cb33363d0e85 ("drm/amd/powerplay: add smu feature name support") Fixes: 6b294793e384 ("drm/amd/powerplay: add smu message name support") Signed-off-by: Colin Ian King colin.king@canonical.com --- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index d029a99e600e..b64113740eb5 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -38,7 +38,7 @@ static const char* __smu_message_names[] = {
const char *smu_get_message_name(struct smu_context *smu, enum smu_message_type type) { - if (type < 0 || type > SMU_MSG_MAX_COUNT) + if (type < 0 || type >= SMU_MSG_MAX_COUNT) return "unknown smu message"; return __smu_message_names[type]; } @@ -51,7 +51,7 @@ static const char* __smu_feature_names[] = {
const char *smu_get_feature_name(struct smu_context *smu, enum smu_feature_mask feature) { - if (feature < 0 || feature > SMU_FEATURE_COUNT) + if (feature < 0 || feature >= SMU_FEATURE_COUNT) return "unknown smu feature"; return __smu_feature_names[feature]; }
On Thu, Aug 1, 2019 at 7:15 AM Colin King colin.king@canonical.com wrote:
From: Colin Ian King colin.king@canonical.com
There are two occurrances of off-by-one upper bound checking of indexes causing potential out-of-bounds array reads. Fix these.
Addresses-Coverity: ("Out-of-bounds read") Fixes: cb33363d0e85 ("drm/amd/powerplay: add smu feature name support") Fixes: 6b294793e384 ("drm/amd/powerplay: add smu message name support") Signed-off-by: Colin Ian King colin.king@canonical.com
Applied. thanks!
Alex
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index d029a99e600e..b64113740eb5 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -38,7 +38,7 @@ static const char* __smu_message_names[] = {
const char *smu_get_message_name(struct smu_context *smu, enum smu_message_type type) {
if (type < 0 || type > SMU_MSG_MAX_COUNT)
if (type < 0 || type >= SMU_MSG_MAX_COUNT) return "unknown smu message"; return __smu_message_names[type];} @@ -51,7 +51,7 @@ static const char* __smu_feature_names[] = {
const char *smu_get_feature_name(struct smu_context *smu, enum smu_feature_mask feature) {
if (feature < 0 || feature > SMU_FEATURE_COUNT)
if (feature < 0 || feature >= SMU_FEATURE_COUNT) return "unknown smu feature"; return __smu_feature_names[feature];}
2.20.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
________________________________ From: Alex Deucher alexdeucher@gmail.com Sent: Friday, August 2, 2019 2:53 AM To: Colin King colin.king@canonical.com Cc: Wang, Kevin(Yang) Kevin1.Wang@amd.com; Rex Zhu rex.zhu@amd.com; Quan, Evan Evan.Quan@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Koenig, Christian Christian.Koenig@amd.com; Zhou, David(ChunMing) David1.Zhou@amd.com; David Airlie airlied@linux.ie; Daniel Vetter daniel@ffwll.ch; amd-gfx list amd-gfx@lists.freedesktop.org; Maling list - DRI developers dri-devel@lists.freedesktop.org; kernel-janitors@vger.kernel.org kernel-janitors@vger.kernel.org; LKML linux-kernel@vger.kernel.org Subject: Re: [PATCH][drm-next] drm/amd/powerplay: fix off-by-one upper bounds limit checks
On Thu, Aug 1, 2019 at 7:15 AM Colin King colin.king@canonical.com wrote:
From: Colin Ian King colin.king@canonical.com
There are two occurrances of off-by-one upper bound checking of indexes causing potential out-of-bounds array reads. Fix these.
Addresses-Coverity: ("Out-of-bounds read") Fixes: cb33363d0e85 ("drm/amd/powerplay: add smu feature name support") Fixes: 6b294793e384 ("drm/amd/powerplay: add smu message name support") Signed-off-by: Colin Ian King colin.king@canonical.com
Applied. thanks!
Alex
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index d029a99e600e..b64113740eb5 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -38,7 +38,7 @@ static const char* __smu_message_names[] = {
const char *smu_get_message_name(struct smu_context *smu, enum smu_message_type type) {
if (type < 0 || type > SMU_MSG_MAX_COUNT)
if (type < 0 || type >= SMU_MSG_MAX_COUNT) return "unknown smu message"; return __smu_message_names[type];} @@ -51,7 +51,7 @@ static const char* __smu_feature_names[] = {
const char *smu_get_feature_name(struct smu_context *smu, enum smu_feature_mask feature) {
if (feature < 0 || feature > SMU_FEATURE_COUNT)
if (feature < 0 || feature >= SMU_FEATURE_COUNT) return "unknown smu feature"; return __smu_feature_names[feature];}
[kevin]: thanks correct it. Reviewed-by: Kevin Wang kevin1.wang@amd.com BR Kevin
-- 2.20.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Colin King -
Wang, Kevin(Yang)