[xsrc/netbsd-9]: xsrc/external/mit/MesaLib/dist/src Pull up following revisio...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/bd40b57a2c30
branches:  netbsd-9
changeset: 10413:bd40b57a2c30
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Dec 12 11:36:34 2019 +0000

description:
Pull up following revision(s) (requested by maya in ticket #526):

        external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c: revision 1.5
        external/mit/MesaLib/dist/src/loader/loader.c: revision 1.2
        external/mit/MesaLib/dist/src/mesa/main/context.c: revision 1.8
        external/mit/MesaLib/dist/src/util/disk_cache.c: revision 1.4
        (all via patch)

Wherever we test for setuid, also test for setgid.

Inspired by a diff to openbsd but with a few more instances.

diffstat:

 external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c |  2 +-
 external/mit/MesaLib/dist/src/loader/loader.c             |  2 +-
 external/mit/MesaLib/dist/src/mesa/main/context.c         |  2 +-
 external/mit/MesaLib/dist/src/util/disk_cache.c           |  2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 1f9fe59a8a09 -r bd40b57a2c30 external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c
--- a/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c Sun Dec 08 15:00:33 2019 +0000
+++ b/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c Thu Dec 12 11:36:34 2019 +0000
@@ -82,7 +82,7 @@
 int
 gen_get_pci_device_id_override(void)
 {
-   if (geteuid() == getuid()) {
+   if (!issetugid()) {
       const char *devid_override = getenv("INTEL_DEVID_OVERRIDE");
       if (devid_override) {
          const int id = gen_device_name_to_pci_device_id(devid_override);
diff -r 1f9fe59a8a09 -r bd40b57a2c30 external/mit/MesaLib/dist/src/loader/loader.c
--- a/external/mit/MesaLib/dist/src/loader/loader.c     Sun Dec 08 15:00:33 2019 +0000
+++ b/external/mit/MesaLib/dist/src/loader/loader.c     Thu Dec 12 11:36:34 2019 +0000
@@ -441,7 +441,7 @@
     * user's problem, but this allows vc4 simulator to run on an i965 host,
     * and may be useful for some touch testing of i915 on an i965 host.
     */
-   if (geteuid() == getuid()) {
+   if (!issetugid()) {
       driver = getenv("MESA_LOADER_DRIVER_OVERRIDE");
       if (driver)
          return strdup(driver);
diff -r 1f9fe59a8a09 -r bd40b57a2c30 external/mit/MesaLib/dist/src/mesa/main/context.c
--- a/external/mit/MesaLib/dist/src/mesa/main/context.c Sun Dec 08 15:00:33 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/context.c Thu Dec 12 11:36:34 2019 +0000
@@ -1223,7 +1223,7 @@
     */
    if (env_var_as_boolean("MESA_NO_ERROR", false)) {
 #if !defined(_WIN32)
-      if (geteuid() == getuid())
+      if (!issetugid())
 #endif
          ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR;
    }
diff -r 1f9fe59a8a09 -r bd40b57a2c30 external/mit/MesaLib/dist/src/util/disk_cache.c
--- a/external/mit/MesaLib/dist/src/util/disk_cache.c   Sun Dec 08 15:00:33 2019 +0000
+++ b/external/mit/MesaLib/dist/src/util/disk_cache.c   Thu Dec 12 11:36:34 2019 +0000
@@ -212,7 +212,7 @@
    size_t cv_size = sizeof(cache_version);
 
    /* If running as a users other than the real user disable cache */
-   if (geteuid() != getuid())
+   if (issetugid())
       return NULL;
 
    /* A ralloc context for transient data during this invocation. */