From e61743b04c1700600ab850f2237c7812243c7840 Mon Sep 17 00:00:00 2001
From: Friedrich Vock <friedrich.vock@gmx.de>
Date: Tue, 30 Jan 2024 15:50:35 +0100
Subject: [PATCH] aux/trace: Guard triggers behind __normal_user

Reviewed-by: Eric Engestrom <eric@igalia.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27381>
(cherry picked from commit f3b892b74ab7db998dd24d8443803ba9dc20f8a6)
---
 .pick_status.json                            | 2 +-
 src/gallium/auxiliary/driver_trace/tr_dump.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index cf49fdd52e1..379cffb3014 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -84,7 +84,7 @@
         "description": "aux/trace: Guard triggers behind __normal_user",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.c b/src/gallium/auxiliary/driver_trace/tr_dump.c
index 20778b50e71..a677ccb4661 100644
--- a/src/gallium/auxiliary/driver_trace/tr_dump.c
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.c
@@ -284,7 +284,7 @@ trace_dump_trace_begin(void)
       atexit(trace_dump_trace_close);
 
       const char *trigger = debug_get_option("GALLIUM_TRACE_TRIGGER", NULL);
-      if (trigger) {
+      if (trigger && __normal_user()) {
          trigger_filename = strdup(trigger);
          trigger_active = false;
       } else