From f2de23e7855cd5346acd3ea32c987ea88e5545db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Fri, 24 Jul 2020 18:14:24 +0200
Subject: [PATCH] util: fix possible buffer overflow in
 util_get_process_exec_path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Found by Coverity.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Fixes: f8f1413070a ("util/u_process: add util_get_process_exec_path")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6067>
(cherry picked from commit f13042ec7ea6842cbee81590f40b0e5c2e25a9bf)
---
 .pick_status.json    | 2 +-
 src/util/u_process.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6e326aa505b..1eb7605ff8b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1804,7 +1804,7 @@
         "description": "util: fix possible buffer overflow in util_get_process_exec_path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "f8f1413070ae079443ab31a75679cfd10cb756ed"
     },
diff --git a/src/util/u_process.c b/src/util/u_process.c
index 74c4d10192e..68fda93a53b 100644
--- a/src/util/u_process.c
+++ b/src/util/u_process.c
@@ -187,6 +187,9 @@ util_get_process_exec_path(char* process_path, size_t len)
 
     return 0;
 success:
+   if (r == len)
+      return 0;
+
     process_path[r] = '\0';
     return r;