OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Fixes memory leak in __getProgramName

Browse Source 
This is happened when multi-threading access to util_get_process_name

memory leak point:
Direct leak of 4097 byte(s) in 1 object(s) allocated from:
    #0 0x7f42888c0e8f in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145
    #1 0x7f4288859d18 in __interceptor_realpath ../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:3608
    #2 0x55a9c272e03d in __getProgramName ../src/util/u_process.c:75
    #3 0x55a9c272e03d in util_get_process_name ../src/util/u_process.c:197
    #4 0x55a9c2746da7 in util_queue_init ../src/util/u_queue.c:416
    #5 0x55a9c272c233 in queue_init ../src/util/perf/u_trace.c:403
    #6 0x55a9c272c233 in u_trace_context_init ../src/util/perf/u_trace.c:453
    #7 0x55a9c262eb54 in test_thread ../src/util/tests/perf/u_trace_test.cpp:14
    #8 0x55a9c275228b in impl_thrd_routine ../src/c11/impl/threads_posix.c:67

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18764>
This commit is contained in:
Yonggang Luo
2022-09-02 12:36:51 +08:00
committed by Marge Bot
parent 171c3c551a
commit 2c1c87f76f
1 changed files with 107 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
src/util/u_process.c
View File

@@ -32,8 +32,6 @@
#include <errno.h>
#include <stdlib.h>
#undef GET_PROGRAM_NAME
#if DETECT_OS_WINDOWS
#include <windows.h>
#else
@@ -49,21 +47,17 @@
#include <sys/sysctl.h>
#endif
#include "util/u_call_once.h"
#undef GET_PROGRAM_NAME_NOT_AVAILABLE
#if defined(__linux__) && defined(HAVE_PROGRAM_INVOCATION_NAME)
static char *path = NULL;
static void __freeProgramPath()
{
free(path);
path = NULL;
}
static const char *
static char *
__getProgramName()
{
char * arg = strrchr(program_invocation_name, '/');
if (arg) {
char *program_name = NULL;
/* If the / character was found this is likely a linux path or
* an invocation path for a 64-bit wine program.
*
@@ -71,20 +65,22 @@ __getProgramName()
* Strip these arguments out by using the realpath only if it was
* a prefix of the invocation name.
*/
if (!path) {
path = realpath("/proc/self/exe", NULL);
atexit(__freeProgramPath);
}
char *path = realpath("/proc/self/exe", NULL);
if (path && strncmp(path, program_invocation_name, strlen(path)) == 0) {
/* This shouldn't be null because path is a a prefix,
* but check it anyway since path is static. */
char * name = strrchr(path, '/');
if (name)
return name + 1;
program_name = strdup(name + 1);
}
return arg+1;
if (path) {
free(path);
}
if (!program_name) {
program_name = strdup(arg+1);
}
return program_name;
}
/* If there was no '/' at all we likely have a windows like path from
@@ -92,109 +88,137 @@ __getProgramName()
*/
arg = strrchr(program_invocation_name, '\\');
if (arg)
return arg+1;
return strdup(arg+1);
return program_invocation_name;
return strdup(program_invocation_name);
}
# define GET_PROGRAM_NAME() __getProgramName()
#elif defined(HAVE_PROGRAM_INVOCATION_NAME)
# define GET_PROGRAM_NAME() program_invocation_short_name
#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(ANDROID)
# define GET_PROGRAM_NAME() getprogname()
#elif defined(__NetBSD__)
static char *
__getProgramName()
{
return strdup(program_invocation_short_name);
}
#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__) || defined(ANDROID) || defined(__NetBSD__)
#if defined(__NetBSD__)
# include <sys/param.h>
# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000100)
# define GET_PROGRAM_NAME() getprogname()
# endif
#endif
#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106000100)
#define GET_PROGRAM_NAME_NOT_AVAILABLE
#else /* !(defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106000100)) */
static char *
__getProgramName()
{
const char *program_name = getprogname();
if (program_name) {
return strdup(program_name);
}
return NULL;
}
#endif /* defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106000100) */
#elif defined(__sun)
/* Solaris has getexecname() which returns the full path - return just
the basename to match BSD getprogname() */
# include <libgen.h>
static const char *
static char *
__getProgramName()
{
static const char *progname;
if (progname == NULL) {
const char *e = getexecname();
if (e != NULL) {
/* Have to make a copy since getexecname can return a readonly
string, but basename expects to be able to modify its arg. */
char *n = strdup(e);
if (n != NULL) {
progname = basename(n);
}
}
}
return progname;
}
# define GET_PROGRAM_NAME() __getProgramName()
#elif DETECT_OS_WINDOWS
static const char *
__getProgramName()
{
static const char *progname;
if (progname == NULL) {
static char buf[MAX_PATH];
GetModuleFileNameA(NULL, buf, sizeof(buf));
progname = strrchr(buf, '\\');
if (progname)
progname++;
else
progname = buf;
char *progname = NULL;
const char *e = getexecname();
if (e != NULL) {
/* Have to make a copy since getexecname can return a readonly
string, but basename expects to be able to modify its arg. */
char *n = strdup(e);
if (n != NULL) {
progname = strdup(basename(n));
free(n);
}
}
return progname;
}
# define GET_PROGRAM_NAME() __getProgramName()
#elif DETECT_OS_WINDOWS
static char *
__getProgramName()
{
char *progname;
static char buf[MAX_PATH];
GetModuleFileNameA(NULL, buf, sizeof(buf));
progname = strrchr(buf, '\\');
if (progname)
progname++;
else
progname = buf;
return strdup(progname);
}
#elif defined(__HAIKU__)
# include <libgen.h>
extern char **__libc_argv;
extern int __libc_argc;
static const char *
static char *
__getProgramName()
{
static const char *progname;
if (progname == NULL) {
char *n = strdup(__libc_argv[0]);
if (n != NULL) {
progname = basename(n);
}
}
return progname;
char *progname = NULL;
char *n = strdup(__libc_argv[0]);
if (n != NULL) {
progname = strdup(basename(n));
free(n);
}
return progname;
}
# define GET_PROGRAM_NAME() __getProgramName()
#else
#define GET_PROGRAM_NAME_NOT_AVAILABLE
#endif
#if !defined(GET_PROGRAM_NAME)
# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__UCLIBC__) || defined(ANDROID)
#if defined(GET_PROGRAM_NAME_NOT_AVAILABLE)
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__UCLIBC__) || defined(ANDROID)
/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.
* Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's
* used as a last resort, if there is no documented facility available. */
static const char *
static char *
__getProgramName()
{
extern const char *__progname;
char * arg = strrchr(__progname, '/');
if (arg)
return arg+1;
return strdup(arg+1);
else
return __progname;
return strdup(__progname);
}
#else
#pragma message ( "Warning: Per application configuration won't work with your OS version." )
static char *
__getProgramName()
{
return strdup("");
}
# define GET_PROGRAM_NAME() __getProgramName()
# else
# define GET_PROGRAM_NAME() ""
# pragma message ( "Warning: Per application configuration won't work with your OS version." )
# endif
#endif
#endif /* GET_PROGRAM_NAME_NOT_AVAILABLE */
static char *program_name;
static void
free_program_name(void)
{
free(program_name);
program_name = NULL;
}
static void
util_get_process_name_callback(void)
{
program_name = __getProgramName();
if (program_name) {
atexit(free_program_name);
}
}
const char *
util_get_process_name(void)
{
return GET_PROGRAM_NAME();
static util_once_flag once_state = UTIL_ONCE_FLAG_INIT;
util_call_once(&once_state, util_get_process_name_callback);
return program_name;
}
size_t