Merge pull request #855 from morphis/correct-id-map

container: correctly calculate uid/gid maps
This commit is contained in:
Simon Fels 2018-08-10 09:24:34 +02:00 committed by GitHub
commit 37818f27f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -80,8 +80,8 @@ void LxcContainer::setup_id_map() {
const auto base_id = unprivileged_uid;
const auto max_id = 65536;
set_config_item("lxc.idmap", utils::string_format("u 0 %d %d", base_id, creds_.uid() - 1));
set_config_item("lxc.idmap", utils::string_format("g 0 %d %d", base_id, creds_.gid() - 1));
set_config_item("lxc.idmap", utils::string_format("u 0 %d %d", base_id, android_system_uid - 1));
set_config_item("lxc.idmap", utils::string_format("g 0 %d %d", base_id, android_system_uid - 1));
// We need to bind the user id for the one running the client side
// process as he is the owner of various socket files we bind mount