drm: Branch 'master'

 xf86drm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bdec97a1991c3cc53d1601eb809e33b154a198d
Author: Nicolai Hähnle <[email protected]>
Date:   Fri May 13 01:11:13 2016 -0500

    xf86drm: ensure proper alignment of pointers in drmProcessPciDevice
    
    Previously, (*device)->businfo.pci would end up misaligned, which results
    in undefined behavior.
    
    Signed-off-by: Nicolai Hähnle <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 4fdcaf8..804a413 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -3000,7 +3000,7 @@ static int drmProcessPciDevice(drmDevicePtr *device, const char *d_name,
                                const char *node, int node_type,
                                int maj, int min, bool fetch_deviceinfo)
 {
-    const int max_node_str = drmGetMaxNodeName();
+    const int max_node_str = ALIGN(drmGetMaxNodeName(), sizeof(void *));
     int ret, i;
     char *addr;

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity 
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches