use secure_getenv instead of getenv

replace the getenv with secure_getenv to avoid some potential risk feature test micro for this function is _GNU_SOURCE Signed-off-by: Carl Zhang <[email protected]>
intel · Mar 28, 2023 · 3aadcf0 · 3aadcf0
1 parent b4b643b
commit 3aadcf0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -183,6 +183,9 @@ PKG_PROG_PKG_CONFIG
 AC_HEADER_STDC
 AC_SYS_LARGEFILE
 
+#check for secure_getenv
+AC_CHECK_FUNCS(secure_getenv)
+
 # Check for Doxygen
 if test "$enable_docs" = "yes"; then
     AC_CHECK_TOOL([DOXYGEN], [doxygen], [no])

diff --git a/meson.build b/meson.build
@@ -134,6 +134,10 @@ elif get_option('with_legacy').contains('fglrx')
   c_args += ['-DHAVE_FGLRX']
 endif
 
+if cc.has_function('secure_getenv')
+  c_args += ['-DHAVE_SECURE_GETENV']
+endif
+
 add_project_arguments(c_args, language: ['c'])
 
 subdir('va')

diff --git a/va/compat_win32.h b/va/compat_win32.h
@@ -53,6 +53,8 @@ typedef unsigned int __uid_t;
 
 #if _MSC_VER
 #define getenv _getenv
+#define secure_getenv _getenv
+#define HAVE_SECURE_GETENV
 inline char* _getenv(const char *varname)
 {
     static char _getenv_buf[32767];

diff --git a/va/va.c b/va/va.c
@@ -57,6 +57,20 @@
 #define CHECK_MAXIMUM(s, ctx, var) if (!va_checkMaximum(dpy, ctx->max_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
 #define CHECK_STRING(s, ctx, var) if (!va_checkString(dpy, ctx->str_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
 
+#ifndef HAVE_SECURE_GETENV
+static char * secure_getenv(const char *name)
+{
+#if defined(__MINGW32__) || defined(__MINGW64__)
+    if (getuid() == geteuid())
+#else
+    if (getuid() == geteuid() && getgid() == getegid())
+#endif
+        return getenv(name);
+    else
+        return NULL;
+}
+#endif
+
 /*
  * read a config "env" for libva.conf or from environment setting
  * libva.conf has higher priority
@@ -97,7 +111,7 @@ int va_parseConfig(char *env, char *env_value)
         fclose(fp);
 
     /* no setting in config file, use env setting */
-    value = getenv(env);
+    value = secure_getenv(env);
     if (value) {
         if (env_value) {
             strncpy(env_value, value, 1024);
@@ -348,7 +362,7 @@ static VAStatus va_getDriverNumCandidates(VADisplay dpy, int *num_candidates)
     VADriverContextP ctx;
 
     ctx = CTX(dpy);
-    driver_name_env = getenv("LIBVA_DRIVER_NAME");
+    driver_name_env = secure_getenv("LIBVA_DRIVER_NAME");
 
     if (pDisplayContext->vaGetNumCandidates)
         vaStatus = pDisplayContext->vaGetNumCandidates(pDisplayContext, num_candidates);
@@ -374,7 +388,7 @@ static VAStatus va_getDriverNameByIndex(VADisplay dpy, char **driver_name, int c
         else
             status = VA_STATUS_ERROR_INVALID_PARAMETER;
     }
-    driver_name_env = getenv("LIBVA_DRIVER_NAME");
+    driver_name_env = secure_getenv("LIBVA_DRIVER_NAME");
     /*if user set driver name by vaSetDriverName */
     if (ctx->override_driver_name) {
         if (*driver_name)
@@ -424,7 +438,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
 
     if (geteuid() == getuid())
         /* don't allow setuid apps to use LIBVA_DRIVERS_PATH */
-        search_path = getenv("LIBVA_DRIVERS_PATH");
+        search_path = secure_getenv("LIBVA_DRIVERS_PATH");
     if (!search_path)
         search_path = VA_DRIVERS_PATH;