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

acpi: limit device scope paths

Browse Source 
Fixes #2371
This commit is contained in:
Alexander Boettcher 2017-05-03 12:48:53 +02:00 committed by Christian Helmuth
parent 4062c63afe
commit 0523736ce4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
repos/os/src/drivers/acpi/acpi.cc
View File

@ -151,18 +151,28 @@ struct Dmar_struct_header : Generic
/* Intel VT-d IO Spec - 8.3.1. */
struct Device_scope : Genode::Mmio
{
enum { MAX_PATHS = 4 };
Device_scope(addr_t a) : Genode::Mmio(a) { }
struct Type : Register<0x0, 8> { enum { PCI_END_POINT = 0x1 }; };
struct Length : Register<0x1, 8> { };
struct Bus : Register<0x5, 8> { };
struct Path : Register_array<0x6, 8, 1, 16> {
struct Path : Register_array<0x6, 8, MAX_PATHS, 16> {
struct Dev : Bitfield<0,8> { };
struct Func : Bitfield<8,8> { };
};
unsigned count() const { return (read<Length>() - 6) / 2; }
unsigned count() const {
unsigned paths = (read<Length>() - 6) / 2;
if (paths > MAX_PATHS) {
Genode::error("Device_scope: more paths (", paths, ") than"
" supported (", (int)MAX_PATHS,")");
return MAX_PATHS;
}
return paths;
}
};