commit e5ed19999d724b6f5131803ff56b3536349b58de
author Dianne Hackborn <hackbod@google.com> Mon Oct 10 16:35:45 2016 -0700
committer Dianne Hackborn <hackbod@google.com> Mon Oct 10 16:58:15 2016 -0700
tree d731c618ac845192b37573abff66d1bbc5dd18ab
parent 9d1ee208d6bd07c8de15b4ec8b29bbba30343ea7

Add a little protection to prevent file opens when shell is done.

Test: N/A
Change-Id: I28b75fb67bc576dfb172ea431ab50e2b2c193ece

cmds/cmd/cmd.cpp

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index 35700b4..443511e 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -56,12 +56,18 @@
 class MyShellCallback : public BnShellCallback
 {
 public:
+    bool mActive = true;
+
     virtual int openOutputFile(const String16& path, const String16& seLinuxContext) {
         String8 path8(path);
         char cwd[256];
         getcwd(cwd, 256);
         String8 fullPath(cwd);
         fullPath.appendPath(path8);
+        if (!mActive) {
+            aerr << "Open attempt after active for: " << fullPath << endl;
+            return -EPERM;
+        }
         int fd = open(fullPath.string(), O_WRONLY|O_CREAT|O_TRUNC, S_IRWXU|S_IRWXG);
         if (fd < 0) {
             return fd;
@@ -136,8 +142,13 @@
         return 20;
     }
 
+    sp<MyShellCallback> cb = new MyShellCallback();
+
     // TODO: block until a result is returned to MyResultReceiver.
     IBinder::shellCommand(service, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO, args,
-            new MyShellCallback(), new MyResultReceiver());
+            cb, new MyResultReceiver());
+
+    cb->mActive = false;
+
     return 0;
 }