diff options
| author | hidehiko <hidehiko@chromium.org> | 2014-11-06 11:20:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-06 19:20:15 +0000 |
| commit | fe27afb06ad8fc0cfe28ace34c6df85fc7b43367 (patch) | |
| tree | eca35e9ec4e6e1c24a375fb848f16d6b81f8d6e2 /ipc | |
| parent | d77a3136bcb91c25b52af05aefe05dedeb12b13e (diff) | |
| download | chromium_src-fe27afb06ad8fc0cfe28ace34c6df85fc7b43367.zip chromium_src-fe27afb06ad8fc0cfe28ace34c6df85fc7b43367.tar.gz chromium_src-fe27afb06ad8fc0cfe28ace34c6df85fc7b43367.tar.bz2 | |
Non-SFI mode: Enable MSG_TRUNC and MSG_CTRUNC code for nacl_helper_nonsfi.
Now, the PNaCL toolchain for Non-SFI build supports MSG_TRUNC and
MSG_CTRUNC, so this CL enables the related code.
BUG=427625, 358465
TEST=Ran trybots.
Review URL: https://codereview.chromium.org/703033003
Cr-Commit-Position: refs/heads/master@{#303065}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_channel_posix.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 79fc7f2..0852993 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -950,15 +950,11 @@ bool ChannelPosix::ExtractFileDescriptorsFromMsghdr(msghdr* msg) { file_descriptors, file_descriptors + num_file_descriptors); -#if !defined(OS_NACL_NONSFI) - // The PNaCl toolchain for Non-SFI binary build does not support - // MSG_CTRUNC. // Check this after adding the FDs so we don't leak them. if (msg->msg_flags & MSG_CTRUNC) { ClearInputFDs(); return false; } -#endif return true; } |