Mesa (master): iris/bufmgr: Handle NULL bufmgr in iris_bufmgr_get_for_fd

[GitLab Mirror]

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

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Wed Oct 28 11:56:27 2020 +0100

iris/bufmgr: Handle NULL bufmgr in iris_bufmgr_get_for_fd

iris_bufmgr_create can return NULL, in which case we'd crash in
list_addtail.

Reported by Coverity/clang (for i965, but iris code looks the same).

Fixes: 7557f1605968 ("iris: share buffer managers accross screens")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7335>

---

 src/gallium/drivers/iris/iris_bufmgr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index b733ab330be..12c13f43733 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -1941,7 +1941,8 @@ iris_bufmgr_get_for_fd(struct gen_device_info *devinfo, int fd, bool bo_reuse)
    }
 
    bufmgr = iris_bufmgr_create(devinfo, fd, bo_reuse);
-   list_addtail(&bufmgr->link, &global_bufmgr_list);
+   if (bufmgr)
+      list_addtail(&bufmgr->link, &global_bufmgr_list);
 
  unlock:
    mtx_unlock(&global_bufmgr_list_mutex);