From 4bca42fc504a2051964030daaa49b5ac49bb64d3 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 29 Apr 2015 10:16:22 +0200 Subject: drmPrime*: initialize output args to 0 Fix Valgrind errors because those memory was uninitialized. https://bugs.freedesktop.org/show_bug.cgi?id=90194 Signed-off-by: Guillaume Desmottes v2: Explicitly zero the whole struct using memclear. Signed-off-by: Emil Velikov --- xf86drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xf86drm.c b/xf86drm.c index 0a66a4a3..49da9c70 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -2721,6 +2721,8 @@ int drmPrimeHandleToFD(int fd, uint32_t handle, uint32_t flags, int *prime_fd) struct drm_prime_handle args; int ret; + memclear(args); + args.fd = -1; args.handle = handle; args.flags = flags; ret = drmIoctl(fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args); @@ -2736,8 +2738,8 @@ int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle) struct drm_prime_handle args; int ret; + memclear(args); args.fd = prime_fd; - args.flags = 0; ret = drmIoctl(fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &args); if (ret) return ret; -- cgit v1.2.3