init: remove session keyring workaround for old kernels
The android-4.14-stable and later kernels support the FS_IOC_ADD_ENCRYPTION_KEY and FS_IOC_REMOVE_ENCRYPTION_KEY ioctls. This has superseded the old way of adding fscrypt keys to the kernel, which was to use the add_key() syscall to add keys to the "session" keyring. On kernels that support the ioctls, Android doesn't use the obsolete way. Since upgrading even just to Android 14 requires at minimum a android-4.14-stable kernel (according to https://source.android.com/docs/core/architecture/kernel/android-common#compatibility-matrix), there is no need to support the obsolete way anymore. Therefore, this commit removes the code from init that created a keyring named "fscrypt" in the session keyring. It also removes the code that created the session keyring itself, since the only reason that Android even created a session keyring was just to hold the "fscrypt" keyring. Flag: N/A for the following reasons: - Removing obsolete code, which is fairly safe - Very early code, so runtime flag cannot be used - Even a build-time flag cannot be used, since init needs recovery_available, which aconfig libraries do not support Bug: 311736104 Test: Build and boot Cuttlefish Change-Id: Id9a184c68cf16d5c4b1d889444cf637c95a91413
This commit is contained in:
parent
bc907c00f4
commit
5d7c35ce20
6 changed files with 0 additions and 28 deletions
|
@ -188,7 +188,6 @@ libinit_cc_defaults {
|
|||
"libfs_mgr",
|
||||
"libgsi",
|
||||
"libhidl-gen-utils",
|
||||
"libkeyutils",
|
||||
"liblog",
|
||||
"liblogwrap",
|
||||
"liblp",
|
||||
|
|
|
@ -592,9 +592,6 @@ static Result<void> queue_fs_event(int code) {
|
|||
} else if (code == FS_MGR_MNTALL_DEV_FILE_ENCRYPTED ||
|
||||
code == FS_MGR_MNTALL_DEV_IS_METADATA_ENCRYPTED ||
|
||||
code == FS_MGR_MNTALL_DEV_NEEDS_METADATA_ENCRYPTION) {
|
||||
if (!FscryptInstallKeyring()) {
|
||||
return Error() << "FscryptInstallKeyring() failed";
|
||||
}
|
||||
SetProperty("ro.crypto.state", "encrypted");
|
||||
|
||||
// Although encrypted, vold has already set the device up, so we do not need to
|
||||
|
|
|
@ -34,28 +34,12 @@
|
|||
#include <cutils/properties.h>
|
||||
#include <cutils/sockets.h>
|
||||
#include <fscrypt/fscrypt.h>
|
||||
#include <keyutils.h>
|
||||
#include <logwrap/logwrap.h>
|
||||
|
||||
#define TAG "fscrypt"
|
||||
|
||||
using namespace android::fscrypt;
|
||||
|
||||
bool FscryptInstallKeyring() {
|
||||
if (keyctl_search(KEY_SPEC_SESSION_KEYRING, "keyring", "fscrypt", 0) != -1) {
|
||||
LOG(INFO) << "Keyring is already created";
|
||||
return true;
|
||||
}
|
||||
key_serial_t device_keyring = add_key("keyring", "fscrypt", 0, 0, KEY_SPEC_SESSION_KEYRING);
|
||||
|
||||
if (device_keyring == -1) {
|
||||
PLOG(ERROR) << "Failed to create keyring";
|
||||
return false;
|
||||
}
|
||||
LOG(INFO) << "Keyring created with id " << device_keyring << " in process " << getpid();
|
||||
return true;
|
||||
}
|
||||
|
||||
// TODO(b/139378601): use a single central implementation of this.
|
||||
static void delete_dir_contents(const std::string& dir) {
|
||||
char* const paths[2] = {const_cast<char*>(dir.c_str()), nullptr};
|
||||
|
|
|
@ -25,6 +25,5 @@ enum class FscryptAction {
|
|||
kDeleteIfNecessary,
|
||||
};
|
||||
|
||||
bool FscryptInstallKeyring();
|
||||
bool FscryptSetDirectoryPolicy(const std::string& ref_basename, FscryptAction action,
|
||||
const std::string& dir);
|
||||
|
|
|
@ -32,7 +32,6 @@ cc_defaults {
|
|||
"libbase",
|
||||
"libfs_mgr",
|
||||
"libhidl-gen-utils",
|
||||
"libkeyutils",
|
||||
"liblog",
|
||||
"libprocessgroup",
|
||||
"libselinux",
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
#include <android-base/thread_annotations.h>
|
||||
#include <fs_avb/fs_avb.h>
|
||||
#include <fs_mgr_vendor_overlay.h>
|
||||
#include <keyutils.h>
|
||||
#include <libavb/libavb.h>
|
||||
#include <libgsi/libgsi.h>
|
||||
#include <libsnapshot/snapshot.h>
|
||||
|
@ -971,11 +970,6 @@ int SecondStageMain(int argc, char** argv) {
|
|||
<< " to /proc/1/oom_score_adj: " << result.error();
|
||||
}
|
||||
|
||||
// Set up a session keyring that all processes will have access to. It
|
||||
// will hold things like FBE encryption keys. No process should override
|
||||
// its session keyring.
|
||||
keyctl_get_keyring_ID(KEY_SPEC_SESSION_KEYRING, 1);
|
||||
|
||||
// Indicate that booting is in progress to background fw loaders, etc.
|
||||
close(open("/dev/.booting", O_WRONLY | O_CREAT | O_CLOEXEC, 0000));
|
||||
|
||||
|
|
Loading…
Reference in a new issue