Mesa (10.4): i965: Use safer pointer arithmetic in gather_oa_results()
Emil Velikov
evelikov at kemper.freedesktop.org
Sun Jan 4 22:07:03 UTC 2015
Module: Mesa
Branch: 10.4
Commit: fffe533f08d7c0cc61841195216e54587a1b77ad
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fffe533f08d7c0cc61841195216e54587a1b77ad
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Mon Dec 22 15:58:49 2014 -0600
i965: Use safer pointer arithmetic in gather_oa_results()
This patch reduces the likelihood of pointer arithmetic overflow bugs in
gather_oa_results(), like the one fixed by b69c7c5dac.
I haven't yet encountered any overflow bugs in the wild along this
patch's codepath. But I get nervous when I see code patterns like this:
(void*) + (int) * (int)
I smell 32-bit overflow all over this code.
This patch retypes 'snapshot_size' to 'ptrdiff_t', which should fix any
potential overflow.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
(cherry picked from commit 414be86c96836b35571185da776d2bce1b620c6a)
---
src/mesa/drivers/dri/i965/brw_performance_monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
index edfa3d2..e683e40 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c
@@ -907,7 +907,7 @@ gather_oa_results(struct brw_context *brw,
return;
}
- const int snapshot_size = brw->perfmon.entries_per_oa_snapshot;
+ const ptrdiff_t snapshot_size = brw->perfmon.entries_per_oa_snapshot;
/* First, add the contributions from the "head" interval:
* (snapshot taken at BeginPerfMonitor time,
More information about the mesa-commit
mailing list