Mesa (staging/20.1): util: fix possible buffer overflow in util_get_process_exec_path

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 8aca794ef32765061f4394f4f097eee375b9f4e0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8aca794ef32765061f4394f4f097eee375b9f4e0

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Fri Jul 24 18:14:24 2020 +0200

util: fix possible buffer overflow in util_get_process_exec_path

Found by Coverity.

Signed-off-by: Marcin Ślusarz <marcin.slusarz at intel.com>
Fixes: f8f1413070a ("util/u_process: add util_get_process_exec_path")
Reviewed-by: Marek Olšák <marek.olsak at 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 0edc1de666f..bb1a00fb0f9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -238,7 +238,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;