commit 621d12e7e3aa4397076cddf69606a0b109b1d648
author Paul Lawrence <paullawrence@google.com> Wed May 06 22:45:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 06 22:45:32 2015 +0000
tree 41be17290a1d6b9776ca006e47eb1df30463f147
parent 7edb3c761af2f0e7adfd73fa3fca418f7892d449
parent 4571383cbf711df21d99529448277966e7ffb11e

am 4571383c: Merge "Use default key permissions for ext4enc"

* commit '4571383cbf711df21d99529448277966e7ffb11e':
  Use default key permissions for ext4enc

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 61edfeb..9c79098 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -359,13 +359,6 @@
     SLOGI("Added key %d (%s) to keyring %d in process %d",
           key_id, ref.c_str(), device_keyring, getpid());
 
-    // ext4enc:TODO set correct permissions
-    long result = keyctl_setperm(key_id, 0x3f3f3f3f);
-    if (result) {
-        SLOGE("KEYCTL_SETPERM failed with error %ld", result);
-        return -1;
-    }
-
     // Save reference to key so we can set policy later
     if (!props.Set(properties::ref, raw_ref)) {
         SLOGE("Cannot save key reference");