Security patches: RestartJob ignores pid, argv[0]; kill runs as child UID

child_job.cc

-// Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class is most definitely NOT re-entrant.
 
 #include "login_manager/child_job.h"
 
 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>
@@ skipping 107 matching lines @@
 bool ChildJob::IsDesiredUidSet() const {
   return is_desired_uid_set_;
 }
 
 const std::string ChildJob::GetName() const {
   FilePath exec_file(arguments_[0]);
   return exec_file.BaseName().value();
 }
 
 void ChildJob::SetArguments(const std::string& arguments) {
+  std::string argv0;
+  if (!arguments_.empty())
+    argv0 = arguments_[0];
+
   arguments_.clear();
   SplitString(arguments, ' ', &arguments_);
+
+  if (!argv0.empty())
+    arguments_[0] = argv0;
 }
 
 char const** ChildJob::CreateArgv() const {
   // Need to append NULL at the end.
   char const** argv = new char const*[arguments_.size() + 1];
   for (size_t i = 0; i < arguments_.size(); ++i) {
     const std::string& arg = arguments_[i];
     int needed_space = arg.length() + 1;
     char* space = new char[needed_space];
     strncpy(space, arg.c_str(), needed_space);
@@ skipping 14 matching lines @@
       to_return = kCantSetGid;
     if (setuid(desired_uid_) == -1)
       to_return = kCantSetUid;
   }
   if (setsid() == -1)
     LOG(ERROR) << "can't setsid: " << strerror(errno);
   return to_return;
 }
 
 }  // namespace login_manager