From 436592d1f4ff0301e4abc4b5dd5e95b28580eba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 27 Oct 2020 11:40:05 +0100 Subject: [PATCH] i965/bufmgr: Handle NULL bufmgr in brw_bufmgr_get_for_fd brw_bufmgr_create can return NULL, in which case we'd crash in list_addtail. Reported by Coverity/clang. Fixes: 4094558e8643 ("i965: share buffer managers across screens") Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit eb61f8959e0a2de35dcfa518ea9963424fe715c4) --- .pick_status.json | 2 +- src/mesa/drivers/dri/i965/brw_bufmgr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1422106d527..ea255893a6a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5557,7 +5557,7 @@ "description": "i965/bufmgr: Handle NULL bufmgr in brw_bufmgr_get_for_fd", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "4094558e8643a266dfc8da9bc073751a3736a2fb" }, diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c index f0d69379f5f..65488c85201 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.c +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c @@ -1947,7 +1947,8 @@ brw_bufmgr_get_for_fd(struct gen_device_info *devinfo, int fd, bool bo_reuse) } bufmgr = brw_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);