Skip to content

Commit e18eb77

Browse files
committed
Merge branch 'vatral-fix-dlopen-vuln' into 3.6.x
Attributes GH PR #1068: #1068
2 parents 3ef7845 + 09c4e21 commit e18eb77

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Index: Mesa_6.4.2/src/glx/x11/dri_glx.c
2+
===================================================================
3+
--- Mesa_6.4.2.orig/src/glx/x11/dri_glx.c
4+
+++ Mesa_6.4.2/src/glx/x11/dri_glx.c
5+
@@ -196,7 +196,7 @@ static __DRIdriver *OpenDriver(const cha
6+
}
7+
}
8+
9+
- if (geteuid() == getuid()) {
10+
+ if (geteuid() == getuid() && getgid() == getegid()) {
11+
/* don't allow setuid apps to use LIBGL_DRIVERS_PATH */
12+
libPaths = getenv("LIBGL_DRIVERS_PATH");
13+
if (!libPaths)

nx-X11/extras/Mesa.patches_6.4.2/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
4005_adapt-all-libX11-include-paths-to-libNX_X11.patch
77
5002_silence-uninitialized.diff
88
1001_support_musl
9+
5003_dlopen-escalation.patch

0 commit comments

Comments
 (0)