xserver: Branch 'master'

[Lyude]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c41d4ff48f72aa964afd131b59e1538295d062dc
Author: Lyude Paul <lyude at redhat.com>
Date:   Wed Jun 27 20:29:42 2018 -0400

    modesetting: Fix uninitialized memory usage in drmmode_crtc_get_fb_id()
    
    This really sucked to find out :(
    
    Signed-off-by: Lyude Paul <lyude at redhat.com>
    Reviewed-by: Karol Herbst <kherbst at redhat.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 53e055611..27b8d51a6 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -604,6 +604,8 @@ drmmode_crtc_get_fb_id(xf86CrtcPtr crtc, uint32_t *fb_id, int *x, int *y)
     drmmode_ptr drmmode = drmmode_crtc->drmmode;
     int ret;
 
+    *fb_id = 0;
+
     if (drmmode_crtc->prime_pixmap) {
         if (!drmmode->reverse_prime_offload_mode) {
             msPixmapPrivPtr ppriv =