Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Unified Diff: sandbox/linux/seccomp-bpf/sandbox_bpf.cc

Issue 11612010: Revert 173536 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/seccomp-bpf/sandbox_bpf.cc
===================================================================
--- sandbox/linux/seccomp-bpf/sandbox_bpf.cc (revision 173604)
+++ sandbox/linux/seccomp-bpf/sandbox_bpf.cc (working copy)
@@ -2,11 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SECCOMP_BPF_STANDALONE
-#include "base/logging.h"
-#include "base/posix/eintr_wrapper.h"
-#endif
-
#include "sandbox/linux/seccomp-bpf/codegen.h"
#include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
#include "sandbox/linux/seccomp-bpf/syscall_iterator.h"
@@ -16,9 +11,7 @@
void WriteFailedStderrSetupMessage(int out_fd) {
const char* error_string = strerror(errno);
- static const char msg[] = "You have reproduced a puzzling issue.\n"
- "Please, report to crbug.com/152530!\n"
- "Failed to set up stderr: ";
+ static const char msg[] = "Failed to set up stderr: ";
if (HANDLE_EINTR(write(out_fd, msg, sizeof(msg)-1)) > 0 && error_string &&
HANDLE_EINTR(write(out_fd, error_string, strlen(error_string))) > 0 &&
HANDLE_EINTR(write(out_fd, "\n", 1))) {
@@ -114,14 +107,9 @@
// successfully turn on sandboxing.
Die::EnableSimpleExit();
- errno = 0;
if (HANDLE_EINTR(close(fds[0]))) {
- // This call to close() has been failing in strange ways. See
- // crbug.com/152530. So we only fail in debug mode now.
-#if !defined(NDEBUG)
WriteFailedStderrSetupMessage(fds[1]);
SANDBOX_DIE(NULL);
-#endif
}
if (HANDLE_EINTR(dup2(fds[1], 2)) != 2) {
// Stderr could very well be a file descriptor to .xsession-errors, or
@@ -131,19 +119,10 @@
// If dup2 fails here, we will continue normally, this means that our
// parent won't cause a fatal failure if something writes to stderr in
// this child.
-#if !defined(NDEBUG)
- // In DEBUG builds, we still want to get a report.
- WriteFailedStderrSetupMessage(fds[1]);
- SANDBOX_DIE(NULL);
-#endif
}
if (HANDLE_EINTR(close(fds[1]))) {
- // This call to close() has been failing in strange ways. See
- // crbug.com/152530. So we only fail in debug mode now.
-#if !defined(NDEBUG)
WriteFailedStderrSetupMessage(fds[1]);
SANDBOX_DIE(NULL);
-#endif
}
evaluators_.clear();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698