summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorRob Clark <[email protected]>2016-09-03 12:57:50 -0400
committerRob Clark <[email protected]>2016-09-07 11:41:38 -0400
commit32c061b110f6c4b6d6c7b1278d4e308e296c3a2a (patch)
tree8a7d2db966dcf4eeb5b0d5326f76400a7b110b73 /src/gallium
parentb4e88b500c93d9728d2a3e30f6b0365bcb224b88 (diff)
freedreno: reject imports with bogus pitch
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/freedreno/freedreno_resource.c7
-rw-r--r--src/gallium/drivers/freedreno/freedreno_screen.c5
-rw-r--r--src/gallium/drivers/freedreno/freedreno_screen.h3
3 files changed, 7 insertions, 8 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 3cc6654b740..1874271c86b 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -898,15 +898,18 @@ fd_resource_from_handle(struct pipe_screen *pscreen,
util_range_init(&rsc->valid_buffer_range);
- rsc->bo = fd_screen_bo_from_handle(pscreen, handle, &slice->pitch);
+ rsc->bo = fd_screen_bo_from_handle(pscreen, handle);
if (!rsc->bo)
goto fail;
rsc->base.vtbl = &fd_resource_vtbl;
rsc->cpp = util_format_get_blocksize(tmpl->format);
- slice->pitch /= rsc->cpp;
+ slice->pitch = handle->stride / rsc->cpp;
slice->offset = handle->offset;
+ if ((slice->pitch < align(prsc->width0, 32)) || (slice->pitch % 32))
+ goto fail;
+
assert(rsc->cpp);
return prsc;
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index fbdd1e2bbde..598a81126e8 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -536,8 +536,7 @@ fd_screen_bo_get_handle(struct pipe_screen *pscreen,
struct fd_bo *
fd_screen_bo_from_handle(struct pipe_screen *pscreen,
- struct winsys_handle *whandle,
- unsigned *out_stride)
+ struct winsys_handle *whandle)
{
struct fd_screen *screen = fd_screen(pscreen);
struct fd_bo *bo;
@@ -558,8 +557,6 @@ fd_screen_bo_from_handle(struct pipe_screen *pscreen,
return NULL;
}
- *out_stride = whandle->stride;
-
return bo;
}
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.h b/src/gallium/drivers/freedreno/freedreno_screen.h
index c52c23b33f5..03ee90a5513 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.h
+++ b/src/gallium/drivers/freedreno/freedreno_screen.h
@@ -86,8 +86,7 @@ boolean fd_screen_bo_get_handle(struct pipe_screen *pscreen,
unsigned stride,
struct winsys_handle *whandle);
struct fd_bo * fd_screen_bo_from_handle(struct pipe_screen *pscreen,
- struct winsys_handle *whandle,
- unsigned *out_stride);
+ struct winsys_handle *whandle);
struct pipe_screen * fd_screen_create(struct fd_device *dev);