commit e8b4805248c596f2d6391c0c4d9713ed3166ffff
author Icecream95 <ixn@disroot.org> Sun Jan 24 20:53:36 2021 +1300
committer Dylan Baker <dylan.c.baker@intel.com> Tue Jan 26 09:21:15 2021 -0800
tree 74925cbc95fc72f314589a639a0613549118a9a4
parent 79eb7c245d1f2695a602e02136f3dbe51f9626ae

panfrost: Use normal malloc/free instead of ralloc for surfaces

Fixes a double-free in some Qt5 WebEngine apps (e.g. ghostwriter).

Cc: mesa-stable
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8678>
(cherry picked from commit 1d967132f3c4aefa72224d1029aa64a34053bf6b)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index a7c5900..36669d2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -274,7 +274,7 @@
         "description": "panfrost: Use normal malloc/free instead of ralloc for surfaces",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },

src/gallium/drivers/panfrost/pan_resource.c

diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 6697042..3d9658e 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -175,7 +175,7 @@
 {
         struct pipe_surface *ps = NULL;
 
-        ps = rzalloc(pipe, struct pipe_surface);
+        ps = CALLOC_STRUCT(pipe_surface);
 
         if (ps) {
                 pipe_reference_init(&ps->reference, 1);
@@ -211,7 +211,7 @@
 {
         assert(surf->texture);
         pipe_resource_reference(&surf->texture, NULL);
-        ralloc_free(surf);
+        free(surf);
 }
 
 static struct pipe_resource *