diff options
| author | Danylo Piliaiev <danylo.piliaiev@globallogic.com> | 2020-09-02 13:37:47 +0300 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-09-11 10:32:42 -0700 |
| commit | d5d434c599d44507eb1a37be4218a98d78e5254c (patch) | |
| tree | 70a4fc4c7b4f5e6cfc8cb373c282fbf3f348d204 | |
| parent | 8b9213e0b7902318a2b1aa5f81fc3cb302f2042c (diff) | |
intel/compiler: Fix pointer arithmetic when reading shader assembly
start_offset is a byte offset.
Fixes: 04a995158084acbd1917b4c7e0f8d381e1c9222d
Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6557>
(cherry picked from commit 87fa645b9438ce7943ae09012f695a7a1bca3eeb)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_eu.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 54a05ae824d..963fc51016f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3154,7 +3154,7 @@ "description": "intel/compiler: Fix pointer arithmetic when reading shader assembly", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "04a995158084acbd1917b4c7e0f8d381e1c9222d" }, diff --git a/src/intel/compiler/brw_eu.cpp b/src/intel/compiler/brw_eu.cpp index 78272f27fbf..17b751ad524 100644 --- a/src/intel/compiler/brw_eu.cpp +++ b/src/intel/compiler/brw_eu.cpp @@ -394,7 +394,7 @@ bool brw_try_override_assembly(struct brw_codegen *p, int start_offset, p->store = (brw_inst *)reralloc_size(p->mem_ctx, p->store, p->next_insn_offset); assert(p->store); - ssize_t ret = read(fd, p->store + start_offset, sb.st_size); + ssize_t ret = read(fd, (char *)p->store + start_offset, sb.st_size); close(fd); if (ret != sb.st_size) { return false; |