1
1
diff --git a/content/common/gpu_pre_sandbox_hook_linux.cc b/content/common/gpu_pre_sandbox_hook_linux.cc
2
- index 97f7221cb1..85b8566e45 100644
2
+ index 97f7221cb1..f159190d33 100644
3
3
--- a/content/common/gpu_pre_sandbox_hook_linux.cc
4
4
+++ b/content/common/gpu_pre_sandbox_hook_linux.cc
5
5
@@ -48,8 +48,8 @@ using sandbox::syscall_broker::BrokerProcess;
@@ -54,20 +54,19 @@ index 97f7221cb1..85b8566e45 100644
54
54
"/usr/lib64/dri/nouveau_dri.so",
55
55
"/usr/lib64/dri/radeonsi_dri.so",
56
56
"/usr/lib64/dri/swrast_dri.so",
57
- @@ -324,6 +333,12 @@ void AddIntelGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
57
+ @@ -324,6 +333,11 @@ void AddIntelGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
58
58
// To support threads in mesa we use --gpu-sandbox-start-early and
59
59
// that requires the following libs and files to be accessible.
60
60
"/usr/lib64/libgallium_dri.so",
61
61
+ #if !BUILDFLAG(IS_CHROMEOS)
62
- + // "/usr/lib64/libgallium-25.0.0.so",
63
62
+ "/usr/lib64/libgallium-25.0.2.so",
64
63
+ "/usr/lib64/gbm/dri_gbm.so",
65
64
+ "/usr/lib64/dri/iHD_drv_video.so",
66
65
+ #endif
67
66
"/usr/lib64/libEGL.so.1", "/usr/lib64/libGLESv2.so.2",
68
67
"/usr/lib64/libelf.so.1", "/usr/lib64/libglapi.so.0",
69
68
"/usr/lib64/libdrm_amdgpu.so.1", "/usr/lib64/libdrm_radeon.so.1",
70
- @@ -363,6 +378 ,11 @@ void AddVirtIOGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
69
+ @@ -363,6 +377 ,11 @@ void AddVirtIOGpuPermissions(std::vector<BrokerFilePermission>* permissions) {
71
70
"/usr/lib64/libglapi.so.0",
72
71
"/usr/lib64/libc++.so.1",
73
72
"/usr/lib64/libgallium_dri.so",
@@ -79,7 +78,7 @@ index 97f7221cb1..85b8566e45 100644
79
78
// If kms_swrast_dri is not usable, swrast_dri is used instead.
80
79
"/usr/lib64/dri/swrast_dri.so",
81
80
"/usr/lib64/dri/kms_swrast_dri.so",
82
- @@ -498,9 +518 ,9 @@ std::vector<BrokerFilePermission> FilePermissionsForGpu(
81
+ @@ -498,9 +517 ,9 @@ std::vector<BrokerFilePermission> FilePermissionsForGpu(
83
82
84
83
AddVulkanICDPermissions(&permissions);
85
84
@@ -91,7 +90,7 @@ index 97f7221cb1..85b8566e45 100644
91
90
if (UseV4L2Codec(options))
92
91
AddV4L2GpuPermissions(&permissions, options);
93
92
if (IsArchitectureArm()) {
94
- @@ -600,10 +620 ,12 @@ void LoadArmGpuLibraries() {
93
+ @@ -600,10 +619 ,12 @@ void LoadArmGpuLibraries() {
95
94
96
95
bool LoadAmdGpuLibraries() {
97
96
// Preload the amdgpu-dependent libraries.
@@ -104,7 +103,7 @@ index 97f7221cb1..85b8566e45 100644
104
103
105
104
const char* radeonsi_lib = "/usr/lib64/dri/radeonsi_dri.so";
106
105
#if defined(DRI_DRIVER_DIR)
107
- @@ -658,7 +680 ,7 @@ bool LoadLibrariesForGpu(
106
+ @@ -658,7 +679 ,7 @@ bool LoadLibrariesForGpu(
108
107
if (IsArchitectureArm()) {
109
108
LoadArmGpuLibraries();
110
109
}
@@ -113,7 +112,7 @@ index 97f7221cb1..85b8566e45 100644
113
112
if (options.use_amd_specific_policies) {
114
113
if (!LoadAmdGpuLibraries())
115
114
return false;
116
- @@ -681,7 +703 ,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
115
+ @@ -681,7 +702 ,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
117
116
command_set.set(sandbox::syscall_broker::COMMAND_ACCESS);
118
117
command_set.set(sandbox::syscall_broker::COMMAND_OPEN);
119
118
command_set.set(sandbox::syscall_broker::COMMAND_STAT);
0 commit comments