On Fri, 2015-02-27 at 18:50 -0800, Ian Romanick wrote:
> From: Ian Romanick <ian.d.roman...@intel.com>
>
> Both the AMD and Intel APIs provide a dataSize parameter, and this
> function would merrily ignore it. Neither API specifies what to do when
> the buffer isn't big enough. I take the easy route of writing all the
> complete bits of data that will fit. With more complete specs, we could
> probably do something different.
>
> I noticed this while looking into an unused parameter warning. The
> warning was actually useful!
>
> brw_performance_monitor.c: In function 'brw_get_perf_monitor_result':
> brw_performance_monitor.c:1261:37: warning: unused parameter 'data_size'
> [-Wunused-parameter]
> GLsizei data_size,
> ^
>
> Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
> Cc: Kenneth Graunke <kenn...@whitecape.org>
> ---
> src/mesa/drivers/dri/i965/brw_performance_monitor.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> index 6c31d4c..08f60d0 100644
> --- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> +++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
> @@ -1264,6 +1264,7 @@ brw_get_perf_monitor_result(struct gl_context *ctx,
> {
> struct brw_context *brw = brw_context(ctx);
> struct brw_perf_monitor_object *monitor = brw_perf_monitor(m);
> + const GLuint *const data_end = (GLuint *)((uint8_t *) data + data_size);
>
> DBG("GetResult(%d)\n", m->Name);
> brw_dump_perf_monitors(brw);
> @@ -1309,9 +1310,11 @@ brw_get_perf_monitor_result(struct gl_context *ctx,
> if (counter < 0 || !BITSET_TEST(m->ActiveCounters[group], counter))
> continue;
>
> - data[offset++] = group;
> - data[offset++] = counter;
> - data[offset++] = monitor->oa_results[i];
> + if (data + 3 <= data_end) {
Shouldn't this be data + offset + 3 ?
> + data[offset++] = group;
> + data[offset++] = counter;
> + data[offset++] = monitor->oa_results[i];
> + }
> }
>
> clean_bookend_bo(brw);
> @@ -1335,10 +1338,12 @@ brw_get_perf_monitor_result(struct gl_context *ctx,
>
> for (int i = 0; i < num_counters; i++) {
> if (BITSET_TEST(m->ActiveCounters[PIPELINE_STATS_COUNTERS], i)) {
> - data[offset++] = PIPELINE_STATS_COUNTERS;
> - data[offset++] = i;
> - *((uint64_t *) (&data[offset])) =
> monitor->pipeline_stats_results[i];
> - offset += 2;
> + if (data + 4 <= data_end) {
Same here.
> + data[offset++] = PIPELINE_STATS_COUNTERS;
> + data[offset++] = i;
> + *((uint64_t *) (&data[offset])) =
> monitor->pipeline_stats_results[i];
> + offset += 2;
> + }
> }
> }
> }
--
Jan Vesely <jan.ves...@rutgers.edu>
signature.asc
Description: This is a digitally signed message part
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
