From 9f3d7d54d80759130cb51137f5d0f9c2432afcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 28 Oct 2020 11:56:27 +0100 Subject: [PATCH] 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 Part-of: (cherry picked from commit 1eda842318704ed477c7669d2c8e94d6394792b9) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_bufmgr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ea255893a6a..3c751cd2db5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5548,7 +5548,7 @@ "description": "iris/bufmgr: Handle NULL bufmgr in iris_bufmgr_get_for_fd", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "7557f1605968c39d680545d5b8457d17eea3b922" }, diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index a2f60f175af..f470856cf86 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -1940,7 +1940,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);