Revert 270173 "Remove SCM_CREDENTIALS fallback code from breakpad"

trunk/src/components/breakpad/app/breakpad_linux.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // For linux_syscall_support.h. This makes it safe to call embedded system
 // calls when in seccomp mode.
 
 #include "components/breakpad/app/breakpad_linux.h"
 
 #include <fcntl.h>
@@ skipping 779 matching lines @@
     // Start constructing the message to send to the browser.
     char distro[kDistroSize + 1] = {0};
     PopulateDistro(distro, NULL);
 
     char b;  // Dummy variable for sys_read below.
     const char* b_addr = &b;  // Get the address of |b| so we can create the
                               // expected /proc/[pid]/syscall content in the
                               // browser to convert namespace tids.
 
     // The length of the control message:
-    static const unsigned kControlMsgSize = sizeof(int);
+    static const unsigned kControlMsgSize = sizeof(fds);
     static const unsigned kControlMsgSpaceSize = CMSG_SPACE(kControlMsgSize);
     static const unsigned kControlMsgLenSize = CMSG_LEN(kControlMsgSize);
 
     struct kernel_msghdr msg;
     my_memset(&msg, 0, sizeof(struct kernel_msghdr));
     struct kernel_iovec iov[kCrashIovSize];
     iov[0].iov_base = const_cast<void*>(crash_context);
     iov[0].iov_len = crash_context_size;
     iov[1].iov_base = distro;
     iov[1].iov_len = kDistroSize + 1;
@@ skipping 19 matching lines @@
     msg.msg_iovlen = kCrashIovSize;
     char cmsg[kControlMsgSpaceSize];
     my_memset(cmsg, 0, kControlMsgSpaceSize);
     msg.msg_control = cmsg;
     msg.msg_controllen = sizeof(cmsg);
 
     struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg);
     hdr->cmsg_level = SOL_SOCKET;
     hdr->cmsg_type = SCM_RIGHTS;
     hdr->cmsg_len = kControlMsgLenSize;
-    ((int*)CMSG_DATA(hdr))[0] = fds[1];
+    ((int*) CMSG_DATA(hdr))[0] = fds[0];
+    ((int*) CMSG_DATA(hdr))[1] = fds[1];
 
     if (HANDLE_EINTR(sys_sendmsg(server_fd_, &msg, 0)) < 0) {
       static const char errmsg[] = "Failed to tell parent about crash.\n";
       WriteLog(errmsg, sizeof(errmsg) - 1);
       IGNORE_RET(sys_close(fds[0]));
       IGNORE_RET(sys_close(fds[1]));
       return false;
     }
     IGNORE_RET(sys_close(fds[1]));
 
@@ skipping 777 matching lines @@
     }
   }
 }
 #endif  // OS_ANDROID
 
 bool IsCrashReporterEnabled() {
   return g_is_crash_reporter_enabled;
 }
 
 }  // namespace breakpad