am 2bc74d1f: am 9885b139: am a962c62c: am 203d5cc5: am 2b62102c: am 4aec0ca7:...

am 2bc74d1f: am 9885b139: am a962c62c: am 203d5cc5: am 2b62102c: am 4aec0ca7: am 312d6038: am a6355635: Don\'t allow "enable_root" in adb.

* commit '2bc74d1f':
  Don't allow "enable_root" in adb.

tests/tests/security/src/android/security/cts/BannedFilesTest.java

@@ -20,7 +20,11 @@ import android.os.cts.FileUtils;
 
 import junit.framework.TestCase;
 
+import java.io.DataInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 
 public class BannedFilesTest extends TestCase {
 
@@ -60,6 +64,34 @@ public class BannedFilesTest extends TestCase {
         }
     }
 
+    public void testNoEnableRoot() throws UnsupportedEncodingException {
+        byte[] badPattern = "enable_root".getBytes("US-ASCII");
+        assertFileDoesNotContain("/system/bin/adb", badPattern);
+    }
+
+    private static void assertFileDoesNotContain(String filename, byte[] pattern) {
+        try {
+            File f = new File(filename);
+            byte[] fileData = new byte[(int) f.length()];
+            DataInputStream dis = new DataInputStream(new FileInputStream(f));
+            dis.readFully(fileData);
+            dis.close();
+
+            outer:
+            for (int i = 0; i < (fileData.length - pattern.length); i++) {
+                for (int j = 0; j < pattern.length; j++) {
+                    if (fileData[i+j] != pattern[j]) {
+                        continue outer;
+                    }
+                }
+                fail("Found banned pattern in " + filename);
+            }
+
+        } catch (IOException e) {
+            // ignore - no such file, or IO error. Assume OK.
+        }
+    }
+
     /**
      * setuid or setgid "ip" command can be used to modify the
      * routing tables of a device, potentially allowing a malicious