pool/MozillaFirefox
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 926488 from home:MSirringhaus:branches:mozilla:Factory

Browse Source 
- Rebase mozilla-sandbox-fips.patch to punch another hole in the
  sandbox containment, to be able to open /proc/sys/crypto/fips_enabled 
  from within the newly introduced socket process sandbox.
  This fixes bsc#1191815 and bsc#1190141

OBS-URL: https://build.opensuse.org/request/show/926488
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=938
This commit is contained in:
Wolfgang Rosenauer 2021-10-21 06:51:24 +00:00 committed by Git OBS Bridge
parent d9fccc7f41
commit 07e2068a94
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MozillaFirefox.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Oct 20 06:49:52 UTC 2021 - Martin Sirringhaus <martin.sirringhaus@suse.com>
- Rebase mozilla-sandbox-fips.patch to punch another hole in the
sandbox containment, to be able to open /proc/sys/crypto/fips_enabled
from within the newly introduced socket process sandbox.
This fixes bsc#1191815 and bsc#1190141
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 18 12:44:44 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org> Mon Oct 18 12:44:44 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>

47
mozilla-sandbox-fips.patch
View File

@ -4,15 +4,11 @@ References:
http://bugzilla.suse.com/show_bug.cgi?id=1167132 http://bugzilla.suse.com/show_bug.cgi?id=1167132
bsc#1174284 - Firefox tab just crashed in FIPS mode bsc#1174284 - Firefox tab just crashed in FIPS mode
diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp Index: firefox-93.0/security/sandbox/linux/Sandbox.cpp
--- a/security/sandbox/linux/Sandbox.cpp ===================================================================
+++ b/security/sandbox/linux/Sandbox.cpp --- firefox-93.0.orig/security/sandbox/linux/Sandbox.cpp
@@ -650,16 +650,17 @@ void SetMediaPluginSandbox(const char* a +++ firefox-93.0/security/sandbox/linux/Sandbox.cpp
SANDBOX_LOG_ERROR("failed to open plugin file %s: %s", aFilePath, @@ -655,6 +655,7 @@ void SetMediaPluginSandbox(const char* a
strerror(errno));
MOZ_CRASH("failed while trying to open the plugin file ");
}
auto files = new SandboxOpenedFiles(); auto files = new SandboxOpenedFiles();
files->Add(std::move(plugin)); files->Add(std::move(plugin));
files->Add("/dev/urandom", SandboxOpenedFile::Dup::YES); files->Add("/dev/urandom", SandboxOpenedFile::Dup::YES);
@ -20,20 +16,11 @@ diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox
files->Add("/etc/ld.so.cache"); // Needed for NSS in clearkey. files->Add("/etc/ld.so.cache"); // Needed for NSS in clearkey.
files->Add("/sys/devices/system/cpu/cpu0/tsc_freq_khz"); files->Add("/sys/devices/system/cpu/cpu0/tsc_freq_khz");
files->Add("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"); files->Add("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq");
files->Add("/proc/cpuinfo"); // Info also available via CPUID instruction. Index: firefox-93.0/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
files->Add("/proc/sys/crypto/fips_enabled"); // Needed for NSS in clearkey. ===================================================================
#ifdef __i386__ --- firefox-93.0.orig/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
files->Add("/proc/self/auxv"); // Info also in process's address space. +++ firefox-93.0/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
#endif @@ -320,6 +320,8 @@ void SandboxBrokerPolicyFactory::InitCon
diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
--- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
+++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
@@ -315,16 +315,18 @@ void SandboxBrokerPolicyFactory::InitCon
policy->AddDir(rdwr, "/dev/dri");
}
// Bug 1575985: WASM library sandbox needs RW access to /dev/null
policy->AddPath(rdwr, "/dev/null");
// Read permissions // Read permissions
policy->AddPath(rdonly, "/dev/urandom"); policy->AddPath(rdonly, "/dev/urandom");
@ -42,8 +29,12 @@ diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/secu
policy->AddPath(rdonly, "/proc/cpuinfo"); policy->AddPath(rdonly, "/proc/cpuinfo");
policy->AddPath(rdonly, "/proc/meminfo"); policy->AddPath(rdonly, "/proc/meminfo");
policy->AddDir(rdonly, "/sys/devices/cpu"); policy->AddDir(rdonly, "/sys/devices/cpu");
policy->AddDir(rdonly, "/sys/devices/system/cpu"); @@ -792,6 +794,8 @@ SandboxBrokerPolicyFactory::GetSocketPro
policy->AddDir(rdonly, "/lib"); auto policy = MakeUnique<SandboxBroker::Policy>();
policy->AddDir(rdonly, "/lib64");
policy->AddDir(rdonly, "/usr/lib"); policy->AddPath(rdonly, "/dev/urandom");
policy->AddDir(rdonly, "/usr/lib32"); + policy->AddPath(rdonly, "/dev/random");
+ policy->AddPath(rdonly, "/proc/sys/crypto/fips_enabled");
policy->AddPath(rdonly, "/proc/cpuinfo");
policy->AddPath(rdonly, "/proc/meminfo");
policy->AddDir(rdonly, "/sys/devices/cpu");