Mesa (master): v3dv: check return value of drmGetMagic

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Nov 30 12:47:31 UTC 2020


Module: Mesa
Branch: master
Commit: b14679ab226bd3e263a778ea8e39828bde38b403
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b14679ab226bd3e263a778ea8e39828bde38b403

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Mon Nov 30 07:44:28 2020 +0100

v3dv: check return value of drmGetMagic

Fixes coverty issue:

** CID 1470345: Error handling issues (CHECKED_RETURN)
/src/broadcom/vulkan/v3dv_device.c: 407 in v3dv_drm_handle_device()
Calling "drmGetMagic" without checking return value (as is done
elsewhere 5 out of 6 times).

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7828>

---

 src/broadcom/vulkan/v3dv_device.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index 608a72d3322..0e2bbf6634e 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -404,7 +404,10 @@ v3dv_drm_handle_device(void *data, struct wl_drm *drm, const char *device)
    info->is_set = info->fd != -1;
 
    drm_magic_t magic;
-   drmGetMagic(info->fd, &magic);
+   if (drmGetMagic(info->fd, &magic)) {
+      fprintf(stderr, "drmGetMagic failed.");
+      return;
+   }
    wl_drm_authenticate(info->wl_drm, magic);
 }
 



More information about the mesa-commit mailing list