Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1694450 - Return Error(ENOSYS) for unsupported madvise args in the GMP process. r=jld

Browse Source 
Because Widevine may probe madvise using advice arguments we do not currently
support, including invalid arguments, this patch changes the handling of these
args so we will not crash in nightly.

Differential Revision: https://phabricator.services.mozilla.com/D106537
This commit is contained in:
Bryce Seager van Dyk 2021-03-10 20:58:44 +00:00
parent 839cfff0f8
commit c7fc3894ed
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/sandbox/linux/SandboxFilter.cpp
View File

@ -748,6 +748,8 @@ class SandboxPolicyCommon : public SandboxPolicyBase {
// madvise hints used by malloc; see bug 1303813 and bug 1364533
case __NR_madvise: {
Arg<int> advice(2);
// The GMP specific sandbox duplicates this logic, so when adding
// allowed values here also add them to the GMP sandbox rules.
return If(advice == MADV_DONTNEED, Allow())
.ElseIf(advice == MADV_FREE, Allow())
.ElseIf(advice == MADV_HUGEPAGE, Allow())
@ -1630,6 +1632,23 @@ class GMPSandboxPolicy : public SandboxPolicyCommon {
CASES_FOR_fcntl:
return Trap(FcntlTrap, nullptr);
// Allow the same advice values as the default policy, but return
// Error(ENOSYS) for other values. Because the Widevine CDM may probe
// advice arguments, including invalid values, we don't want to return
// InvalidSyscall(), as this will crash the process. So instead just
// indicate such calls are not available.
case __NR_madvise: {
Arg<int> advice(2);
return If(advice == MADV_DONTNEED, Allow())
.ElseIf(advice == MADV_FREE, Allow())
.ElseIf(advice == MADV_HUGEPAGE, Allow())
.ElseIf(advice == MADV_NOHUGEPAGE, Allow())
#ifdef MOZ_ASAN
.ElseIf(advice == MADV_DONTDUMP, Allow())
#endif
.Else(Error(ENOSYS));
}
default:
return SandboxPolicyCommon::EvaluateSyscall(sysno);
}