diff options
| author | Dan Carpenter <error27@gmail.com> | 2011-02-26 04:48:18 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-28 09:17:59 +1000 |
| commit | cf8a47d1561a44f77f0269834a669e377b382f62 (patch) | |
| tree | afda20204b6cd3744db6d87f6df1009915d6853c /drivers/gpu/drm/radeon/r600_cs.c | |
| parent | dc87eaf1771d15152ca379a0b7c32df57a0e87dc (diff) | |
| download | blackbird-op-linux-cf8a47d1561a44f77f0269834a669e377b382f62.tar.gz blackbird-op-linux-cf8a47d1561a44f77f0269834a669e377b382f62.zip | |
drm/radeon/r600_cs: off by one errors
There are a bunch of off by one errors in the sanity checks here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cs.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 4706294f0ae0..fa7c6e58205b 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -159,7 +159,7 @@ static const struct gpu_formats color_formats_table[] = { static inline bool fmt_is_valid_color(u32 format) { - if (format > ARRAY_SIZE(color_formats_table)) + if (format >= ARRAY_SIZE(color_formats_table)) return false; if (color_formats_table[format].valid_color) @@ -170,7 +170,7 @@ static inline bool fmt_is_valid_color(u32 format) static inline bool fmt_is_valid_texture(u32 format) { - if (format > ARRAY_SIZE(color_formats_table)) + if (format >= ARRAY_SIZE(color_formats_table)) return false; if (color_formats_table[format].blockwidth > 0) @@ -181,7 +181,7 @@ static inline bool fmt_is_valid_texture(u32 format) static inline int fmt_get_blocksize(u32 format) { - if (format > ARRAY_SIZE(color_formats_table)) + if (format >= ARRAY_SIZE(color_formats_table)) return 0; return color_formats_table[format].blocksize; @@ -190,7 +190,8 @@ static inline int fmt_get_blocksize(u32 format) static inline int fmt_get_nblocksx(u32 format, u32 w) { unsigned bw; - if (format > ARRAY_SIZE(color_formats_table)) + + if (format >= ARRAY_SIZE(color_formats_table)) return 0; bw = color_formats_table[format].blockwidth; @@ -203,7 +204,8 @@ static inline int fmt_get_nblocksx(u32 format, u32 w) static inline int fmt_get_nblocksy(u32 format, u32 h) { unsigned bh; - if (format > ARRAY_SIZE(color_formats_table)) + + if (format >= ARRAY_SIZE(color_formats_table)) return 0; bh = color_formats_table[format].blockheight; @@ -216,7 +218,8 @@ static inline int fmt_get_nblocksy(u32 format, u32 h) static inline int r600_bpe_from_format(u32 *bpe, u32 format) { unsigned res; - if (format > ARRAY_SIZE(color_formats_table)) + + if (format >= ARRAY_SIZE(color_formats_table)) goto fail; res = color_formats_table[format].blocksize; |
