OSDN Git Service

egl/x11: calloc dri2_surf so it's properly zeroed
authorKenneth Graunke <kenneth@whitecape.org>
Fri, 7 Jun 2019 05:17:06 +0000 (22:17 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Fri, 7 Jun 2019 05:45:27 +0000 (22:45 -0700)
commit4e3297f7d4d87618bf896ac503e1f036a7b6befb
tree9fc58f7db130fcecd069d6fc5628bc1ac02c307a
parent04dac6975234d3b4e5da6aa61e6b787cb576f0e6
egl/x11: calloc dri2_surf so it's properly zeroed

Commit 2282ec0a refactored drawable creation across various platforms
into a new dri2_create_drawable helper function.

The GBM code in platform_drm.c code passed in dri2_surf->gbm_surf as the
loaderPrivate, while most other backends passed in dri2_surf directly.

To try and handle this, the patch checked if dri2_surf->gbm_surf was
non-NULL, and if so, presumed that the caller is the DRM platform and
we should use the dri2_surf->gbm_surf pointer.

This worked for most platforms, which calloc their dri2_surf structure,
zeroing the data.  Unfortunately, platform_x11.c used malloc, leaving
most of the dri2_surf as garbage.  In particular, dri2_surf->gbm_surf
was often non-NULL, causing dri2_create_drawable to try and use it,
passing a garbage pointer to the createNewDrawable hook, usually leading
to a SIGBUS or SIGSEGV when trying to dereference that bad pointer.

Since most callers calloc the data, make platform_x11.c follow suit.

Fixes crashes with i915_dri.so when running dEQP-GLES2.

Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
src/egl/drivers/dri2/platform_x11.c