diff options
| author | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 08:54:16 +0000 |
|---|---|---|
| committer | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 08:54:16 +0000 |
| commit | 41101f86728169e7f22480979591b40b90cb6435 (patch) | |
| tree | 659a04a49a4907fea1a7ee175d450f92f8c6fff4 /content/browser/renderer_host/render_sandbox_host_linux.cc | |
| parent | 8d4ff17dc2992c6d2c6130b06d246b9e707cf0e4 (diff) | |
| download | chromium_src-41101f86728169e7f22480979591b40b90cb6435.zip chromium_src-41101f86728169e7f22480979591b40b90cb6435.tar.gz chromium_src-41101f86728169e7f22480979591b40b90cb6435.tar.bz2 | |
Remove socket hacks for FreeBSD and OpenBSD
Support for UNIX-domain SOCK_SEQPACKET sockets was added in FreeBSD 9
(Jan 2012) and OpenBSD 5.0 (Nov 2011):
http://www.freebsd.org/cgi/man.cgi?query=unix&sektion=4&manpath=FreeBSD+9.0-RELEASE&format=html
http://www.openbsd.org/cgi-bin/man.cgi?query=unix&sektion=4&manpath=OpenBSD+5.0&format=html
Review URL: https://codereview.chromium.org/247733004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_sandbox_host_linux.cc')
| -rw-r--r-- | content/browser/renderer_host/render_sandbox_host_linux.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc index 2aea9ed..b0ef6f0 100644 --- a/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -724,17 +724,10 @@ void RenderSandboxHostLinux::Init(const std::string& sandbox_path) { // We use SOCK_SEQPACKET rather than SOCK_DGRAM to prevent the renderer from // sending datagrams to other sockets on the system. The sandbox may prevent // the renderer from calling socket() to create new sockets, but it'll still - // inherit some sockets. With PF_UNIX+SOCK_DGRAM, it can call sendmsg to send + // inherit some sockets. With AF_UNIX+SOCK_DGRAM, it can call sendmsg to send // a datagram to any (abstract) socket on the same system. With // SOCK_SEQPACKET, this is prevented. -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) - // The BSDs often don't support SOCK_SEQPACKET yet, so fall back to - // SOCK_DGRAM if necessary. - if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) != 0) - CHECK(socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == 0); -#else CHECK(socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) == 0); -#endif renderer_socket_ = fds[0]; const int browser_socket = fds[1]; |