* [patch] radeon: range check issues
@ 2010-03-28 11:23 Dan Carpenter
2010-04-01 3:43 ` Alex Deucher
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2010-03-28 11:23 UTC (permalink / raw)
To: Dave Airlie
Cc: Alex Deucher, Jerome Glisse, Rafał Miłecki, dri-devel,
linux-kernel
This change makes the array larger, "MAX_SUPPORTED_TV_TIMING_V1_2" is 3
and the original size "MAX_SUPPORTED_TV_TIMING" is 2.
Also there were checks that were off by one.
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
Compile tested only. Changing the array size seemed like the right
thing to do, in the context, but please review carefully.
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
index 6732b5d..27e2c71 100644
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@ -2912,7 +2912,7 @@ typedef struct _ATOM_ANALOG_TV_INFO_V1_2
UCHAR ucTV_BootUpDefaultStandard;
UCHAR ucExt_TV_ASIC_ID;
UCHAR ucExt_TV_ASIC_SlaveAddr;
- ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING];
+ ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING_V1_2];
}ATOM_ANALOG_TV_INFO_V1_2;
typedef struct _ATOM_DPCD_INFO
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 93783b1..bdc0ab3 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1275,7 +1275,7 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
switch (crev) {
case 1:
tv_info = (ATOM_ANALOG_TV_INFO *)(mode_info->atom_context->bios + data_offset);
- if (index > MAX_SUPPORTED_TV_TIMING)
+ if (index >= MAX_SUPPORTED_TV_TIMING)
return false;
mode->crtc_htotal = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Total);
@@ -1313,7 +1313,7 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
break;
case 2:
tv_info_v1_2 = (ATOM_ANALOG_TV_INFO_V1_2 *)(mode_info->atom_context->bios + data_offset);
- if (index > MAX_SUPPORTED_TV_TIMING_V1_2)
+ if (index >= MAX_SUPPORTED_TV_TIMING_V1_2)
return false;
dtd_timings = &tv_info_v1_2->aModeTimings[index];
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] radeon: range check issues
2010-03-28 11:23 [patch] radeon: range check issues Dan Carpenter
@ 2010-04-01 3:43 ` Alex Deucher
0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2010-04-01 3:43 UTC (permalink / raw)
To: Dan Carpenter, Dave Airlie, Alex Deucher, Jerome Glisse,
Rafał Miłecki, dri-devel, linux-kernel
On Sun, Mar 28, 2010 at 7:23 AM, Dan Carpenter <error27@gmail.com> wrote:
> This change makes the array larger, "MAX_SUPPORTED_TV_TIMING_V1_2" is 3
> and the original size "MAX_SUPPORTED_TV_TIMING" is 2.
>
> Also there were checks that were off by one.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
> ---
> Compile tested only. Changing the array size seemed like the right
> thing to do, in the context, but please review carefully.
That patch is correct and corresponds to the actual table sizes in the vbios.
Alex
>
> diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
> index 6732b5d..27e2c71 100644
> --- a/drivers/gpu/drm/radeon/atombios.h
> +++ b/drivers/gpu/drm/radeon/atombios.h
> @@ -2912,7 +2912,7 @@ typedef struct _ATOM_ANALOG_TV_INFO_V1_2
> UCHAR ucTV_BootUpDefaultStandard;
> UCHAR ucExt_TV_ASIC_ID;
> UCHAR ucExt_TV_ASIC_SlaveAddr;
> - ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING];
> + ATOM_DTD_FORMAT aModeTimings[MAX_SUPPORTED_TV_TIMING_V1_2];
> }ATOM_ANALOG_TV_INFO_V1_2;
>
> typedef struct _ATOM_DPCD_INFO
> diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
> index 93783b1..bdc0ab3 100644
> --- a/drivers/gpu/drm/radeon/radeon_atombios.c
> +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
> @@ -1275,7 +1275,7 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
> switch (crev) {
> case 1:
> tv_info = (ATOM_ANALOG_TV_INFO *)(mode_info->atom_context->bios + data_offset);
> - if (index > MAX_SUPPORTED_TV_TIMING)
> + if (index >= MAX_SUPPORTED_TV_TIMING)
> return false;
>
> mode->crtc_htotal = le16_to_cpu(tv_info->aModeTimings[index].usCRTC_H_Total);
> @@ -1313,7 +1313,7 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index,
> break;
> case 2:
> tv_info_v1_2 = (ATOM_ANALOG_TV_INFO_V1_2 *)(mode_info->atom_context->bios + data_offset);
> - if (index > MAX_SUPPORTED_TV_TIMING_V1_2)
> + if (index >= MAX_SUPPORTED_TV_TIMING_V1_2)
> return false;
>
> dtd_timings = &tv_info_v1_2->aModeTimings[index];
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-01 3:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-28 11:23 [patch] radeon: range check issues Dan Carpenter
2010-04-01 3:43 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).