From 3f23020c5c71cc01ec8c70c80db855ab9cb0c3e3 Mon Sep 17 00:00:00 2001 From: Stanca Serban Date: Sat, 24 Jun 2023 02:32:30 +0300 Subject: [PATCH] Backed out changeset 714fb5e0c999 (bug 1786885) for causing bustages in ChromeUtils.webidl. CLOSED TREE --- dom/base/ChromeUtils.cpp | 39 ------------ dom/base/ChromeUtils.h | 4 -- dom/chrome-webidl/ChromeUtils.webidl | 37 ----------- .../test/browser_content_sandbox_syscalls.js | 62 +++++++++++++++---- .../subprocess/subprocess_shared_unix.js | 9 ++- .../subprocess/subprocess_shared_win.js | 26 +++++--- .../subprocess/subprocess_unix.sys.mjs | 2 +- 7 files changed, 74 insertions(+), 105 deletions(-) diff --git a/dom/base/ChromeUtils.cpp b/dom/base/ChromeUtils.cpp index 64428bfc1ea5..69cb450fabe3 100644 --- a/dom/base/ChromeUtils.cpp +++ b/dom/base/ChromeUtils.cpp @@ -61,14 +61,6 @@ #include "nsIException.h" #include "VsyncSource.h" -#ifdef XP_UNIX -# include -# include -# include -# include -# include -#endif - namespace mozilla::dom { /* static */ @@ -981,37 +973,6 @@ void ChromeUtils::DefineESModuleGetters(const GlobalObject& global, } } -#ifdef XP_UNIX -/* static */ -void ChromeUtils::GetLibcConstants(const GlobalObject&, - LibcConstants& aConsts) { - aConsts.mEINTR.Construct(EINTR); - aConsts.mEACCES.Construct(EACCES); - aConsts.mEAGAIN.Construct(EAGAIN); - aConsts.mEINVAL.Construct(EINVAL); - aConsts.mENOSYS.Construct(ENOSYS); - - aConsts.mF_SETFD.Construct(F_SETFD); - aConsts.mF_SETFL.Construct(F_SETFL); - - aConsts.mFD_CLOEXEC.Construct(FD_CLOEXEC); - - aConsts.mAT_EACCESS.Construct(AT_EACCESS); - - aConsts.mO_CREAT.Construct(O_CREAT); - aConsts.mO_NONBLOCK.Construct(O_NONBLOCK); - aConsts.mO_WRONLY.Construct(O_WRONLY); - - aConsts.mPOLLERR.Construct(POLLERR); - aConsts.mPOLLHUP.Construct(POLLHUP); - aConsts.mPOLLIN.Construct(POLLIN); - aConsts.mPOLLNVAL.Construct(POLLNVAL); - aConsts.mPOLLOUT.Construct(POLLOUT); - - aConsts.mPR_CAPBSET_READ.Construct(PR_CAPBSET_READ); -} -#endif - /* static */ void ChromeUtils::OriginAttributesToSuffix( dom::GlobalObject& aGlobal, const dom::OriginAttributesDictionary& aAttrs, diff --git a/dom/base/ChromeUtils.h b/dom/base/ChromeUtils.h index 1382228003f8..762e4f3af216 100644 --- a/dom/base/ChromeUtils.h +++ b/dom/base/ChromeUtils.h @@ -226,10 +226,6 @@ class ChromeUtils { JS::Handle modules, ErrorResult& aRv); -#ifdef XP_UNIX - static void GetLibcConstants(const GlobalObject&, LibcConstants& aConsts); -#endif - static void GetCallerLocation(const GlobalObject& global, nsIPrincipal* principal, JS::MutableHandle aRetval); diff --git a/dom/chrome-webidl/ChromeUtils.webidl b/dom/chrome-webidl/ChromeUtils.webidl index 25f165377810..8a7a174944cc 100644 --- a/dom/chrome-webidl/ChromeUtils.webidl +++ b/dom/chrome-webidl/ChromeUtils.webidl @@ -289,14 +289,6 @@ namespace ChromeUtils { [Throws] undefined defineLazyGetter(object aTarget, any aName, object aLambda); - -#ifdef XP_UNIX - /** - * Return platform-specific libc constants, such as errno values. - */ - LibcConstants getLibcConstants(); -#endif - /** * IF YOU ADD NEW METHODS HERE, MAKE SURE THEY ARE THREAD-SAFE. */ @@ -1035,32 +1027,3 @@ enum PopupBlockerState { "openAbused", "openOverridden", }; - -#ifdef XP_UNIX -dictionary LibcConstants { - long EINTR; - long EACCES; - long EAGAIN; - long EINVAL; - long ENOSYS; - - long F_SETFD; - long F_SETFL; - - long FD_CLOEXEC: - - long AT_EACCESS; - - long O_CREAT; - long O_NONBLOCK; - long O_WRONLY; - - long POLLIN; - long POLLOUT; - long POLLERR; - long POLLHUP; - long POLLNVAL; - - long PR_CAPBSET_READ; -}; -#endif diff --git a/security/sandbox/test/browser_content_sandbox_syscalls.js b/security/sandbox/test/browser_content_sandbox_syscalls.js index 28e1b1d9d2e2..63cc9217811d 100644 --- a/security/sandbox/test/browser_content_sandbox_syscalls.js +++ b/security/sandbox/test/browser_content_sandbox_syscalls.js @@ -9,10 +9,33 @@ Services.scriptloader.loadSubScript( this ); -const lazy = {}; +const ERRNO = { + EACCES: 13, + EINVAL: 22, + get ENOSYS() { + const os = Services.appinfo.OS; -/* getLibcConstants is only present on *nix */ -XPCOMUtils.defineLazyGetter(lazy, "LIBC", () => ChromeUtils.getLibcConstants()); + if (["Linux", "Android"].includes(os)) { + // https://github.com/torvalds/linux/blob/9a48d604672220545d209e9996c2a1edbb5637f6/include/uapi/asm-generic/errno.h#L18 + return 38; + } else if ( + ["Darwin", "DragonFly", "FreeBSD", "OpenBSD", "NetBSD"].includes(os) + ) { + /* + * Darwin: https://opensource.apple.com/source/xnu/xnu-201/bsd/sys/errno.h.auto.html + * DragonFly: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/5e488df32cb01056a5b714a522e51c69ab7b4612/sys/sys/errno.h#L172 + * FreeBSD: https://github.com/freebsd/freebsd-src/blob/7232e6dcc89b978825b30a537bca2e7d3a9b71bb/sys/sys/errno.h#L157 + * OpenBSD: https://github.com/openbsd/src/blob/025fffe4c6e0113862ce4e1927e67517a2841502/sys/sys/errno.h#L151 + * NetBSD: https://github.com/NetBSD/src/blob/ff24f695f5f53540b23b6bb4fa5c0b9d79b369e4/sys/sys/errno.h#L137 + */ + return 78; + } else if (os === "WINNT") { + // https://learn.microsoft.com/en-us/cpp/c-runtime-library/errno-constants?view=msvc-170 + return 40; + } + throw new Error("Unsupported OS"); + }, +}; /* * This test is for executing system calls in content processes to validate @@ -144,6 +167,20 @@ function callFaccessat2(args) { return rv; } +// open syscall flags +function openWriteCreateFlags() { + Assert.ok(isMac() || isLinux()); + if (isMac()) { + let O_WRONLY = 0x001; + let O_CREAT = 0x200; + return O_WRONLY | O_CREAT; + } + // Linux + let O_WRONLY = 0x01; + let O_CREAT = 0x40; + return O_WRONLY | O_CREAT; +} + // Returns the name of the native library needed for native syscalls function getOSLib() { switch (Services.appinfo.OS) { @@ -287,7 +324,7 @@ add_task(async function () { if (isLinux() || isMac()) { // open a file for writing in $HOME, this should fail let path = fileInHomeDir().path; - let flags = lazy.LIBC.O_CREAT | lazy.LIBC.O_WRONLY; + let flags = openWriteCreateFlags(); let fd = await SpecialPowers.spawn( browser, [{ lib, path, flags }], @@ -302,7 +339,7 @@ add_task(async function () { // macOS and work on Linux. The open handler in the content process closes // the file for us let path = fileInTempDir().path; - let flags = lazy.LIBC.O_CREAT | lazy.LIBC.O_WRONLY; + let flags = openWriteCreateFlags(); let fd = await SpecialPowers.spawn( browser, [{ lib, path, flags }], @@ -353,11 +390,13 @@ add_task(async function () { if (isLinux()) { // These constants are not portable. + const AT_EACCESS = 512; + const PR_CAPBSET_READ = 23; // verify we block PR_CAPBSET_READ with EINVAL - let option = lazy.LIBC.PR_CAPBSET_READ; + let option = PR_CAPBSET_READ; let rv = await SpecialPowers.spawn(browser, [{ lib, option }], callPrctl); - ok(rv === lazy.LIBC.EINVAL, "prctl(PR_CAPBSET_READ) is blocked"); + ok(rv === ERRNO.EINVAL, "prctl(PR_CAPBSET_READ) is blocked"); const kernelVersion = await getKernelVersion(); const glibcVersion = getGlibcVersion(); @@ -373,18 +412,15 @@ add_task(async function () { [{ lib, dirfd, path, mode, flag: 0x01 }], callFaccessat2 ); - ok( - rv === lazy.LIBC.ENOSYS, - "faccessat2 (flag=0x01) was blocked with ENOSYS" - ); + ok(rv === ERRNO.ENOSYS, "faccessat2 (flag=0x01) was blocked with ENOSYS"); rv = await SpecialPowers.spawn( browser, - [{ lib, dirfd, path, mode, flag: lazy.LIBC.AT_EACCESS }], + [{ lib, dirfd, path, mode, flag: AT_EACCESS }], callFaccessat2 ); ok( - rv === lazy.LIBC.EACCES, + rv === ERRNO.EACCES, "faccessat2 (flag=0x200) was allowed, errno=EACCES" ); } else { diff --git a/toolkit/modules/subprocess/subprocess_shared_unix.js b/toolkit/modules/subprocess/subprocess_shared_unix.js index 0b264dd339bc..ad07dd785478 100644 --- a/toolkit/modules/subprocess/subprocess_shared_unix.js +++ b/toolkit/modules/subprocess/subprocess_shared_unix.js @@ -5,6 +5,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; +if (typeof Components !== "undefined") { + /* global OS */ + Cc["@mozilla.org/net/osfileconstantsservice;1"] + .getService(Ci.nsIOSFileConstantsService) + .init(); +} + /* exported LIBC, libc */ // ctypes is either already available in the chrome worker scope, or defined @@ -14,7 +21,7 @@ // This file is loaded into the same scope as subprocess_shared.js. /* import-globals-from subprocess_shared.js */ -var LIBC = ChromeUtils.getLibcConstants(); +var LIBC = OS.Constants.libc; const LIBC_CHOICES = ["libc.so", "libSystem.B.dylib", "a.out"]; diff --git a/toolkit/modules/subprocess/subprocess_shared_win.js b/toolkit/modules/subprocess/subprocess_shared_win.js index 96b912b97084..2b9eb69c6d0e 100644 --- a/toolkit/modules/subprocess/subprocess_shared_win.js +++ b/toolkit/modules/subprocess/subprocess_shared_win.js @@ -5,7 +5,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -/* exported createPipe, libc, win32 */ +if (typeof Components !== "undefined") { + /* global OS */ + Cc["@mozilla.org/net/osfileconstantsservice;1"] + .getService(Ci.nsIOSFileConstantsService) + .init(); +} + +/* exported LIBC, Win, createPipe, libc, win32 */ // ctypes is either already available in the chrome worker scope, or defined // in scope via loadSubScript. @@ -14,6 +21,10 @@ // This file is loaded into the same scope as subprocess_shared.js. /* import-globals-from subprocess_shared.js */ +const LIBC = OS.Constants.libc; + +const Win = OS.Constants.Win; + const LIBC_CHOICES = ["kernel32.dll"]; var win32 = { @@ -88,13 +99,8 @@ Object.assign(win32, { ERROR_BROKEN_PIPE: 109, ERROR_INSUFFICIENT_BUFFER: 122, - FILE_ATTRIBUTE_NORMAL: 0x00000080, FILE_FLAG_OVERLAPPED: 0x40000000, - GENERIC_WRITE: 0x40000000, - - OPEN_EXISTING: 0x00000007, - PIPE_TYPE_BYTE: 0x00, PIPE_ACCESS_INBOUND: 0x01, @@ -444,7 +450,7 @@ win32.Handle = function (handle) { win32.createPipe = function (secAttr, readFlags = 0, writeFlags = 0, size = 0) { readFlags |= win32.PIPE_ACCESS_INBOUND; - writeFlags |= win32.FILE_ATTRIBUTE_NORMAL; + writeFlags |= Win.FILE_ATTRIBUTE_NORMAL; if (size == 0) { size = 4096; @@ -465,7 +471,7 @@ win32.createPipe = function (secAttr, readFlags = 0, writeFlags = 0, size = 0) { ); let isInvalid = handle => - String(handle) == String(win32.INVALID_HANDLE_VALUE); + String(handle) == String(win32.HANDLE(Win.INVALID_HANDLE_VALUE)); if (isInvalid(readHandle)) { return []; @@ -473,10 +479,10 @@ win32.createPipe = function (secAttr, readFlags = 0, writeFlags = 0, size = 0) { let writeHandle = libc.CreateFileW( pipeName, - win32.GENERIC_WRITE, + Win.GENERIC_WRITE, 0, secAttr.address(), - win32.OPEN_EXISTING, + Win.OPEN_EXISTING, writeFlags, null ); diff --git a/toolkit/modules/subprocess/subprocess_unix.sys.mjs b/toolkit/modules/subprocess/subprocess_unix.sys.mjs index 26c415550f84..8f5349b94bfe 100644 --- a/toolkit/modules/subprocess/subprocess_unix.sys.mjs +++ b/toolkit/modules/subprocess/subprocess_unix.sys.mjs @@ -105,7 +105,7 @@ var SubprocessUnix = { *getEnvironment() { let environ; - if (Services.appinfo.LIBC === "Darwin") { + if (Services.appinfo.OS === "Darwin") { environ = libc._NSGetEnviron().contents; } else { environ = libc.environ;