ehmry/genode-ehmry
ehmry/genode-ehmry
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: fix RM-session upgrade mechanism

Browse Source 
This is a follow-up commit of "base/core: use references instead of
pointers". Because the 'Rm_root::_upgrade_session' implementation
lacked the 'override' keyword, my overzealous change of the pointer
argument went unnoticed.

This commit fixes the depot_rom (cached_fs_rom) failure in Sculpt.
When cached_fs_rom attempted to create a new managed dataspace while the
RM session quota was depleted, it tried to upgrade the session (via
Rm_connection::create). However, the upgraded resources never reached
the actual session because the default 'Root_component::_upgrade_session'
was called instead of 'Rm_root::_upgrade_session'.

Issue #3135
This commit is contained in:
Norman Feske 2019-02-13 15:47:33 +01:00
parent 5e9102f031
commit 924e5c54eb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/base/src/core/include/rm_root.h
View File

@ -40,10 +40,10 @@ class Genode::Rm_root : public Root_component<Rm_session_component>
Rm_session_component(*this->ep(), *md_alloc(), _pager_ep, ram_quota);
}
void _upgrade_session(Rm_session_component &rm, const char *args)
void _upgrade_session(Rm_session_component *rm, const char *args) override
{
size_t ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0);
rm.upgrade_ram_quota(ram_quota);
rm->upgrade_ram_quota(ram_quota);
}
public:

2
repos/base/src/core/include/vm_root.h
View File

@ -42,7 +42,7 @@ class Genode::Vm_root : public Root_component<Vm_session_component>
_ram_allocator, _local_rm);
}
void _upgrade_session(Vm_session_component *vm, const char *args)
void _upgrade_session(Vm_session_component *vm, const char *args) override
{
vm->upgrade(ram_quota_from_args(args));
vm->upgrade(cap_quota_from_args(args));