* [patch] drm/radeon/dpm: off by one in si_set_mc_special_registers()
@ 2013-07-02 6:20 Dan Carpenter
2013-09-28 9:35 ` Dan Carpenter
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2013-07-02 6:20 UTC (permalink / raw)
To: David Airlie; +Cc: Alex Deucher, dri-devel, kernel-janitors
These checks should be ">=" instead of ">". j is used as an offset into
the table->mc_reg_address[] array and that has
SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE (16) elements.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index 6918f07..ea88bbe 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -5126,7 +5126,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
table->mc_reg_table_entry[k].mc_data[j] |= 0x100;
}
j++;
- if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+ if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
return -EINVAL;
if (!pi->mem_gddr5) {
@@ -5136,7 +5136,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
table->mc_reg_table_entry[k].mc_data[j] (table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16;
j++;
- if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+ if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
return -EINVAL;
}
break;
@@ -5149,7 +5149,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
(temp_reg & 0xffff0000) |
(table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff);
j++;
- if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+ if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
return -EINVAL;
break;
default:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [patch] drm/radeon/dpm: off by one in si_set_mc_special_registers()
2013-07-02 6:20 [patch] drm/radeon/dpm: off by one in si_set_mc_special_registers() Dan Carpenter
@ 2013-09-28 9:35 ` Dan Carpenter
2013-10-02 15:35 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2013-09-28 9:35 UTC (permalink / raw)
To: David Airlie; +Cc: Alex Deucher, dri-devel, kernel-janitors
These checks should be ">=" instead of ">". j is used as an offset into
the table->mc_reg_address[] array and that has
SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE (16) elements.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
index cfe5d4d..4a1220c 100644
--- a/drivers/gpu/drm/radeon/si_dpm.c
+++ b/drivers/gpu/drm/radeon/si_dpm.c
@@ -5184,7 +5184,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
table->mc_reg_table_entry[k].mc_data[j] |= 0x100;
}
j++;
- if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+ if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
return -EINVAL;
if (!pi->mem_gddr5) {
@@ -5194,7 +5194,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
table->mc_reg_table_entry[k].mc_data[j] (table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16;
j++;
- if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+ if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
return -EINVAL;
}
break;
@@ -5207,7 +5207,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
(temp_reg & 0xffff0000) |
(table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff);
j++;
- if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+ if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
return -EINVAL;
break;
default:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] drm/radeon/dpm: off by one in si_set_mc_special_registers()
2013-09-28 9:35 ` Dan Carpenter
@ 2013-10-02 15:35 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2013-10-02 15:35 UTC (permalink / raw)
To: Dan Carpenter
Cc: David Airlie, Alex Deucher, kernel-janitors,
Maling list - DRI developers
On Sat, Sep 28, 2013 at 5:35 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> These checks should be ">=" instead of ">". j is used as an offset into
> the table->mc_reg_address[] array and that has
> SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE (16) elements.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied. thanks!
Alex
>
> diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c
> index cfe5d4d..4a1220c 100644
> --- a/drivers/gpu/drm/radeon/si_dpm.c
> +++ b/drivers/gpu/drm/radeon/si_dpm.c
> @@ -5184,7 +5184,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
> table->mc_reg_table_entry[k].mc_data[j] |= 0x100;
> }
> j++;
> - if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
> + if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
> return -EINVAL;
>
> if (!pi->mem_gddr5) {
> @@ -5194,7 +5194,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
> table->mc_reg_table_entry[k].mc_data[j] > (table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16;
> j++;
> - if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
> + if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
> return -EINVAL;
> }
> break;
> @@ -5207,7 +5207,7 @@ static int si_set_mc_special_registers(struct radeon_device *rdev,
> (temp_reg & 0xffff0000) |
> (table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff);
> j++;
> - if (j > SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
> + if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
> return -EINVAL;
> break;
> default:
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-02 15:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 6:20 [patch] drm/radeon/dpm: off by one in si_set_mc_special_registers() Dan Carpenter
2013-09-28 9:35 ` Dan Carpenter
2013-10-02 15:35 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox