Bug 1396733 - Add flatpak font dirs to the sandbox whitelist. r?jld draft
authorGian-Carlo Pascutto <gcp@mozilla.com>
Wed, 13 Sep 2017 13:41:21 +0200
changeset 663796 0c67f446f040b07651f2aca04b3eeb8d027bf7f9
parent 663795 39ac5504b7780d02ec1853e54407e30a1c53ff01
child 663941 26b2eaf88bba756666fe2e0e862e193743d6ebe2
child 664037 e8238029dda3f0d151788405e0a0770656a99044
push id79535
push usergpascutto@mozilla.com
push dateWed, 13 Sep 2017 11:42:04 +0000
reviewersjld
bugs1396733
milestone57.0a1
Bug 1396733 - Add flatpak font dirs to the sandbox whitelist. r?jld Also clean up the order of paths a bit. MozReview-Commit-ID: GM62r4N9wL7
security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
--- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
@@ -94,30 +94,33 @@ SandboxBrokerPolicyFactory::SandboxBroke
 #endif // MOZ_PULSEAUDIO
   }
 #endif // MOZ_WIDGET_GTK
 
   // Read permissions
   policy->AddPath(rdonly, "/dev/urandom");
   policy->AddPath(rdonly, "/proc/cpuinfo");
   policy->AddPath(rdonly, "/proc/meminfo");
+  policy->AddDir(rdonly, "/sys/devices/cpu");
+  policy->AddDir(rdonly, "/sys/devices/system/cpu");
   policy->AddDir(rdonly, "/lib");
   policy->AddDir(rdonly, "/lib64");
+  policy->AddDir(rdonly, "/usr/lib");
+  policy->AddDir(rdonly, "/usr/lib32");
+  policy->AddDir(rdonly, "/usr/lib64");
   policy->AddDir(rdonly, "/etc");
   policy->AddDir(rdonly, "/usr/share");
   policy->AddDir(rdonly, "/usr/local/share");
-  policy->AddDir(rdonly, "/usr/lib");
-  policy->AddDir(rdonly, "/usr/lib32");
-  policy->AddDir(rdonly, "/usr/lib64");
-  policy->AddDir(rdonly, "/usr/X11R6/lib/X11/fonts");
   policy->AddDir(rdonly, "/usr/tmp");
   policy->AddDir(rdonly, "/var/tmp");
-  policy->AddDir(rdonly, "/sys/devices/cpu");
-  policy->AddDir(rdonly, "/sys/devices/system/cpu");
+  // Various places where fonts reside
+  policy->AddDir(rdonly, "/usr/X11R6/lib/X11/fonts");
   policy->AddDir(rdonly, "/nix/store");
+  policy->AddDir(rdonly, "/run/host/fonts");
+  policy->AddDir(rdonly, "/run/host/user-fonts");
 
   // Bug 1384178: Mesa driver loader
   policy->AddPrefix(rdonly, "/sys/dev/char/226:");
 
   // Bug 1385715: NVIDIA PRIME support
   policy->AddPath(rdonly, "/proc/modules");
 
 #ifdef MOZ_PULSEAUDIO