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

ahci: make policy checking more fail-safe

Browse Source 
Handle cases where no policy is given and/or no policy matches.

Fixes #2033.
This commit is contained in:
Josef Söntgen 2016-07-05 09:39:15 +02:00 committed by Norman Feske
parent 11a4e7888d
commit a5dd3fa1e9
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
repos/os/src/drivers/ahci/main.cc
View File

@ -68,18 +68,28 @@ class Block::Root_multiple_clients : public Root_component< ::Session_component>
Genode::Allocator &_alloc;
Genode::Xml_node _config;
Xml_node _lookup_policy(char const *label)
{
for (Xml_node policy = _config.sub_node("policy");;
policy = policy.next("policy")) {
char label_buf[64];
policy.attribute("label").value(label_buf, sizeof(label_buf));
if (Genode::strcmp(label, label_buf) == 0) {
return policy;
}
}
throw Xml_node::Nonexistent_sub_node();
}
long _device_num(const char *session_label, char *model, char *sn, size_t bufs_len)
{
long num = -1;
Xml_node policy = _config.sub_node("policy");
for (;; policy = policy.next("policy")) {
char label_buf[64];
policy.attribute("label").value(label_buf, sizeof(label_buf));
if (Genode::strcmp(session_label, label_buf))
continue;
try {
Xml_node policy = _lookup_policy(session_label);
/* try read device port number attribute */
try {
@ -92,8 +102,7 @@ class Block::Root_multiple_clients : public Root_component< ::Session_component>
policy.attribute("model").value(model, bufs_len);
policy.attribute("serial").value(sn, bufs_len);
} catch (...) { }
break;
}
} catch (...) { }
return num;
}