Commit: d28cb2befd083eb0a9b0435cf5c8e768d08f94c7 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Révision: d28cb2befd083eb0a9b0435cf5c8e768d08f94c7 (tree)
• l'heure: 2016-09-04 08:47:14
• Auteur: Steve Kondik <steve@cyng...>
• Commiter: Steve Kondik

Message de Log

adb: Check for alternate shell paths

• Check for persist.sys.adb.shell first
  
• Check for /sbin/sh (recovery)
  

Change-Id: I191b9289b176809ef754d7a8126acfd355ab009f

Change Summary

• modified: adb/shell_service.cpp

Modification

--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -85,6 +85,7 @@
 #include <pty.h>
 #include <pwd.h>
 #include <sys/select.h>
+#include <sys/stat.h>
 #include <termios.h>
 
 #include <memory>
@@ -103,6 +104,8 @@
 #include "adb_utils.h"
 #include "security_log_tags.h"
 
+#include "cutils/properties.h"
+
 namespace {
 
 void init_subproc_child()
@@ -228,6 +231,7 @@ bool Subprocess::ForkAndExec(std::string* error) {
     ScopedFd child_stdinout_sfd, child_stderr_sfd;
     ScopedFd parent_error_sfd, child_error_sfd;
     char pts_name[PATH_MAX];
+    char propbuf[PATH_MAX];
 
     if (command_.empty()) {
         __android_log_security_bswrite(SEC_TAG_ADB_SHELL_INTERACTIVE, "");
@@ -334,12 +338,25 @@ bool Subprocess::ForkAndExec(std::string* error) {
         parent_error_sfd.Reset();
         close_on_exec(child_error_sfd.fd());
 
+        std::string shell_command;
+        struct stat st;
+        property_get("persist.sys.adb.shell", propbuf, "");
+        if (propbuf[0] != '\0' && stat(propbuf, &st) == 0) {
+            shell_command = propbuf;
+        } else if (stat(_PATH_BSHELL2, &st) == 0) {
+            shell_command = _PATH_BSHELL2;
+        } else {
+            shell_command = _PATH_BSHELL;
+        }
+
         if (command_.empty()) {
-            execle(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr, cenv.data());
+            execle(shell_command.c_str(), shell_command.c_str(), "-", nullptr, cenv.data());
         } else {
-            execle(_PATH_BSHELL, _PATH_BSHELL, "-c", command_.c_str(), nullptr, cenv.data());
+            execle(shell_command.c_str(), shell_command.c_str(), "-c", command_.c_str(), nullptr, cenv.data());
         }
-        WriteFdExactly(child_error_sfd.fd(), "exec '" _PATH_BSHELL "' failed: ");
+
+        std::string errmsg = "exec '" + shell_command + "' failed: ";
+        WriteFdExactly(child_error_sfd.fd(), errmsg.c_str());
         WriteFdExactly(child_error_sfd.fd(), strerror(errno));
         child_error_sfd.Reset();
         _Exit(1);