From: Chris Michael <cpmichael@osg.samsung.com>
Date: Tue, 26 Apr 2016 15:00:40 +0000 (-0400)
Subject: ecore-drm: Add missing initializer for fb2 command
X-Git-Tag: upstream/1.20.0~6599
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d450fba64f52d6bac2f236273cc0b8203ef5ac5;p=platform%2Fupstream%2Fefl.git

ecore-drm: Add missing initializer for fb2 command

drm_mode_fb_cmd2 has fields for a modifier to handle tiling,
compression, etc (per plane). Even tho we do not use these, we should
at least initialize them to zero else we end up with uninitialized
bytes in the cmd structure.

==11706== Syscall param ioctl(generic) points to uninitialised byte(s)
==11706==    at 0x57E05D9: ioctl (in /usr/lib/libc-2.20.so)
==11706==    by 0x4D30FA3: drmIoctl (in /usr/lib/libdrm.so.2.4.0)
==11706==    by 0x4CDF66B: _ecore_drm_fb_create2 (ecore_drm_fb.c:63)

@fix

Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
---

diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index f705fa2..7f3d323 100644
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -40,6 +40,7 @@ _ecore_drm_fb_create2(int fd, Ecore_Drm_Fb *fb)
 {
    struct drm_mode_fb_cmd2 cmd;
    uint32_t hdls[4], pitches[4], offsets[4], fmt;
+   uint64_t modifiers[4];
 
 #define _fourcc_code(a,b,c,d) \
    ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
@@ -49,6 +50,7 @@ _ecore_drm_fb_create2(int fd, Ecore_Drm_Fb *fb)
    hdls[0] = fb->hdl;
    pitches[0] = fb->stride;
    offsets[0] = 0;
+   modifiers[0] = 0;
 
    memset(&cmd, 0, sizeof(struct drm_mode_fb_cmd2));
    cmd.fb_id = 0;
@@ -59,6 +61,7 @@ _ecore_drm_fb_create2(int fd, Ecore_Drm_Fb *fb)
    memcpy(cmd.handles, hdls, 4 * sizeof(hdls[0]));
    memcpy(cmd.pitches, pitches, 4 * sizeof(pitches[0]));
    memcpy(cmd.offsets, offsets, 4 * sizeof(offsets[0]));
+   memcpy(cmd.modifier, modifiers, 4 * sizeof(modifiers[0]));
 
    if (drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &cmd))
      return EINA_FALSE;