[Mesa-stable] [Mesa-dev] [PATCH] egl/wayland: bail out when drmGetMagic fails

[Tapani Pälli]

Similar warning is done in platform_x11.c;

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 11/23/18 2:59 PM, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Currently as the function fails, we pass uninitialized data to the
> authentication function. Stop doing that and print an warning when
> the function fails.
> 
> Cc: mesa-stable at lists.freedesktop.org
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>   src/egl/drivers/dri2/platform_wayland.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
> index cda6f25a7e0..f2dc26d5850 100644
> --- a/src/egl/drivers/dri2/platform_wayland.c
> +++ b/src/egl/drivers/dri2/platform_wayland.c
> @@ -1134,7 +1134,10 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device)
>      if (drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER) {
>         dri2_dpy->authenticated = true;
>      } else {
> -      drmGetMagic(dri2_dpy->fd, &magic);
> +      if (drmGetMagic(dri2_dpy->fd, &magic)) {
> +         _eglLog(_EGL_WARNING, "wayland-egl: drmGetMagic failed");
> +         return;
> +      }
>         wl_drm_authenticate(dri2_dpy->wl_drm, magic);
>      }
>   }
>