Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e68dd72 authored by Steve Fung's avatar Steve Fung
Browse files

crash_reporter: Call dbus-send using chromeos::ProcessImpl 

Convert the call to dbus-send from system() to chromeos::ProcessImpl
so that the shell_exec selinux policy can be removed.

Bug: 23280203
Change-Id: I692ebecf5b7f0611de252225cedabcdefd56dff8
parent 2ae47a0b

crash_reporter/crash_reporter.cc

+18 −12
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <base/strings/string_util.h>

#include <base/strings/stringprintf.h>

#include <chromeos/flag_helper.h>

#include <chromeos/process.h>

#include <chromeos/syslog_logging.h>

#include <metrics/metrics_library.h>
@@ -85,27 +86,32 @@ static void CountUncleanShutdown() { 


static void CountUserCrash() {

  SendCrashMetrics(kCrashKindUser, "user");

  std::string command = StringPrintf(

      "/system/bin/dbus-send --type=signal --system / \"%s\" &",

      kUserCrashSignal);

  // Announce through D-Bus whenever a user crash happens. This is

  // used by the metrics daemon to log active use time between

  // crashes.

  //

  // This could be done more efficiently by explicit fork/exec or

  // using a dbus library directly. However, this should run

  // relatively rarely and longer term we may need to implement a

  // better way to do this that doesn't rely on D-Bus.

  //

  // We run in the background in case dbus daemon itself is crashed

  // We run in the background in case dbus-daemon itself is crashed

  // and not responding.  This allows us to not block and potentially

  // deadlock on a dbus-daemon crash.  If dbus-daemon crashes without

  // restarting, each crash will fork off a lot of dbus-send

  // processes.  Such a system is in a unusable state and will need

  // to be restarted anyway.



  int status = system(command.c_str());

  LOG_IF(WARNING, status != 0) << "dbus-send running failed";

  //

  // Note: This will mean that the dbus-send process will become a zombie and

  // reparent to init for reaping, but that's OK -- see above.



  chromeos::ProcessImpl dbus_send;

  dbus_send.AddArg("/system/bin/dbus-send");

  dbus_send.AddArg("--type=signal");

  dbus_send.AddArg("--system");

  dbus_send.AddArg("/");

  dbus_send.AddArg(kUserCrashSignal);

  bool status = dbus_send.Start();

  if (status) {

    dbus_send.Release();

  } else {

    PLOG(WARNING) << "Sending UserCrash DBus signal failed";

  }

}