Revert "crossystem: Updated crossystem to accomodate Android"stabilize-jetstream-7390.62.Bstabilize-jetstream-7390.54.Bstabilize-7390.68.Bstabilize-7390.59.Brelease-R46-7390.B

This reverts commit 26825b53dc914e4599767ae1e78fe731840027c1.

This looks like it breaks ARM systems by causing crossystem to crash freeing stuff.

BUG=chromium:523189

Change-Id: Ic1e1594519354e7b80424f5c66dc9bdb2605ec73
Reviewed-on: https://chromium-review.googlesource.com/295215
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Commit-Queue: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>

1 files changed, 8 insertions, 62 deletions

diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c
index b69f435d..6c745ff2 100644
--- a/host/arch/arm/lib/crossystem_arch.c
+++ b/host/arch/arm/lib/crossystem_arch.c
@@ -25,8 +25,7 @@
 #include "crossystem.h"
 #include "crossystem_arch.h"
 
-#define MOSYS_CROS_PATH "/usr/sbin/mosys"
-#define MOSYS_ANDROID_PATH "/system/bin/mosys"
+#define MOSYS_PATH "/usr/sbin/mosys"
 
 /* Base name for firmware FDT files */
 #define FDT_BASE_PATH "/proc/device-tree/firmware/chromeos"
@@ -49,7 +48,6 @@
 #define FNAME_SIZE  80
 #define SECTOR_SIZE 512
 #define MAX_NMMCBLK 9
-#define MAX_ARRAY_SIZE 256
 
 typedef struct PlatformFamily {
   const char* compatible_string; /* Last string in FDT compatible entry */
@@ -71,31 +69,6 @@ const PlatformFamily platform_family_array[] = {
   {NULL, NULL}
 };
 
-static const char* GetMosysPath() {
-	int fd;
-	struct stat s;
-
-	/* In Android, mosys utility located in /system/bin
-	   check if file exists.  Using fstat because for some
-	   reason, stat() was seg faulting in Android */
-	fd = open(MOSYS_ANDROID_PATH, O_RDONLY);
-	if (fstat(fd, &s) == 0) {
-		close(fd);
-		return MOSYS_ANDROID_PATH;
-	}
-	close(fd);
-
-	fd = open(MOSYS_CROS_PATH, O_RDONLY);
-	if (fstat(fd, &s) == 0) {
-		close(fd);
-		return MOSYS_CROS_PATH;
-	}
-	close(fd);
-
-	return NULL;
-
-}
-
 static int FindEmmcDev(void) {
   int mmcblk;
   unsigned value;
@@ -314,12 +287,10 @@ out:
   return ret;
 }
 
-static int ExecuteMosys(const char * const argv[], char *buf, size_t bufsize) {
+static int ExecuteMosys(char * const argv[], char *buf, size_t bufsize) {
   int status, mosys_to_crossystem[2];
   pid_t pid;
   ssize_t n;
-  char *argv_cpy[MAX_ARRAY_SIZE];
-  int i = 0;
 
   if (pipe(mosys_to_crossystem) < 0) {
     VBDEBUG(("pipe() error\n"));
@@ -341,30 +312,10 @@ static int ExecuteMosys(const char * const argv[], char *buf, size_t bufsize) {
         exit(1);
       }
     }
-
-    /* for some reason execv takes a char *const, so need to
-       make a duplicate copy of it and free it right after exec
-       in order to minimize the passing around of a non-const
-       copy of our array */
-    for (i = 0; argv[i] != NULL && i < MAX_ARRAY_SIZE; i++) {
-      argv_cpy[i] = strdup(argv[i]);
-    }
-    if (i >= MAX_ARRAY_SIZE) {
-      VBDEBUG(("too many args (mosys)\n"))
-      for (i = 0; argv_cpy[i] != NULL && i < MAX_ARRAY_SIZE; i++) {
-        free(argv_cpy[i]);
-      }
-      close(mosys_to_crossystem[1]);
-      exit(1);
-    }
-    argv_cpy[i] = NULL;
-    execv(argv[0], argv_cpy);
-
+    /* Execute mosys */
+    execv(MOSYS_PATH, argv);
     /* We shouldn't be here; exit now! */
     VBDEBUG(("execv() of mosys failed\n"));
-    for (i = 0; argv_cpy[i] != NULL && i < MAX_ARRAY_SIZE; i++) {
-      free(argv_cpy[i]);
-    }
     close(mosys_to_crossystem[1]);
     exit(1);
   } else {  /* Parent */
@@ -379,9 +330,6 @@ static int ExecuteMosys(const char * const argv[], char *buf, size_t bufsize) {
     } else {
       n = 0;
     }
-    for (i = 0; argv_cpy[i] != NULL && i < MAX_ARRAY_SIZE; i++) {
-      free(argv_cpy[i]);
-    }
     close(mosys_to_crossystem[0]);
     if (n < 0)
       VBDEBUG(("read() error while reading output from mosys\n"));
@@ -398,9 +346,8 @@ static int ExecuteMosys(const char * const argv[], char *buf, size_t bufsize) {
 
 static int VbReadNvStorage_mosys(VbNvContext* vnc) {
   char hexstring[VBNV_BLOCK_SIZE * 2 + 32];  /* Reserve extra 32 bytes */
-  const char *path = GetMosysPath();
-  const char * const argv[] = {
-    path, "nvram", "vboot", "read", NULL
+  char * const argv[] = {
+    MOSYS_PATH, "nvram", "vboot", "read", NULL
   };
   char hexdigit[3];
   int i;
@@ -418,9 +365,8 @@ static int VbReadNvStorage_mosys(VbNvContext* vnc) {
 
 static int VbWriteNvStorage_mosys(VbNvContext* vnc) {
   char hexstring[VBNV_BLOCK_SIZE * 2 + 1];
-  const char *path = GetMosysPath();
-  const char * const argv[] = {
-    path, "nvram", "vboot", "write", hexstring, NULL
+  char * const argv[] = {
+    MOSYS_PATH, "nvram", "vboot", "write", hexstring, NULL
   };
   int i;