From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Fri, 3 Apr 2020 12:13:43 +0000 (+0300)
Subject: drm-shim: stub libdrm's use of realpath()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=373f1eb9deab9d9435fba15be6de2a28bde79b87;p=mesa.git

drm-shim: stub libdrm's use of realpath()

libdrm started using realpath to get the type of bus associated with a
given device. This stubs the very specific usage that prevents
drm-shim's device from being listed.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4429>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4429>
---

diff --git a/src/drm-shim/drm_shim.c b/src/drm-shim/drm_shim.c
index e6f7bf9e992..325a8a142e5 100644
--- a/src/drm-shim/drm_shim.c
+++ b/src/drm-shim/drm_shim.c
@@ -75,6 +75,7 @@ REAL_FUNCTION_POINTER(opendir);
 REAL_FUNCTION_POINTER(readdir);
 REAL_FUNCTION_POINTER(readdir64);
 REAL_FUNCTION_POINTER(readlink);
+REAL_FUNCTION_POINTER(realpath);
 REAL_FUNCTION_POINTER(__xstat);
 REAL_FUNCTION_POINTER(__xstat64);
 REAL_FUNCTION_POINTER(__fxstat);
@@ -84,6 +85,8 @@ REAL_FUNCTION_POINTER(__fxstat64);
 static char *render_node_path;
 /* renderD* */
 static char *render_node_dirent_name;
+/* /sys/dev/char/major:minor/device */
+static char *device_path;
 /* /sys/dev/char/major:minor/device/subsystem */
 static char *subsystem_path;
 int render_node_minor = -1;
@@ -187,6 +190,7 @@ init_shim(void)
    GET_FUNCTION_POINTER(readdir);
    GET_FUNCTION_POINTER(readdir64);
    GET_FUNCTION_POINTER(readlink);
+   GET_FUNCTION_POINTER(realpath);
    GET_FUNCTION_POINTER(__xstat);
    GET_FUNCTION_POINTER(__xstat64);
    GET_FUNCTION_POINTER(__fxstat);
@@ -199,6 +203,10 @@ init_shim(void)
               render_node_path);
    }
 
+   asprintf(&device_path,
+            "/sys/dev/char/%d:%d/device",
+            DRM_MAJOR, render_node_minor);
+
    asprintf(&subsystem_path,
             "/sys/dev/char/%d:%d/device/subsystem",
             DRM_MAJOR, render_node_minor);
@@ -476,6 +484,20 @@ readlink(const char *path, char *buf, size_t size)
    return strlen(buf) + 1;
 }
 
+/* Handles libdrm's realpath to figure out what kind of device we have. */
+PUBLIC char *
+realpath(const char *path, char *resolved_path)
+{
+   init_shim();
+
+   if (strcmp(path, device_path) != 0)
+      return real_realpath(path, resolved_path);
+
+   strcpy(resolved_path, path);
+
+   return resolved_path;
+}
+
 /* Main entrypoint to DRM drivers: the ioctl syscall.  We send all ioctls on
  * our DRM fd to drm_shim_ioctl().
  */