ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-22 08:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

genode_c_api: safeguard session-policy parsing

Browse Source 
Fix #4294
This commit is contained in:
Stefan Kalkowski
2021-10-11 11:24:28 +02:00
committed by Norman Feske
parent b7a379546e
commit 1d1379430a
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
repos/os/src/lib/genode_c_api/usb.cc
View File

@ -453,20 +453,22 @@ genode_usb_session::genode_usb_session(::Root & root,
bool ::Root::_matches(Device & d, genode_usb_session & s) bool ::Root::_matches(Device & d, genode_usb_session & s)
{ {
Session_policy const policy(s._label, _config.xml()); try {
Session_policy const policy(s._label, _config.xml());
unsigned long vendor = policy.attribute_value<unsigned long>("vendor_id", 0); unsigned long vendor = policy.attribute_value<unsigned long>("vendor_id", 0);
unsigned long product = policy.attribute_value<unsigned long>("product_id", 0); unsigned long product = policy.attribute_value<unsigned long>("product_id", 0);
unsigned long bus = policy.attribute_value<unsigned long>("bus", 0); unsigned long bus = policy.attribute_value<unsigned long>("bus", 0);
unsigned long dev = policy.attribute_value<unsigned long>("dev", 0); unsigned long dev = policy.attribute_value<unsigned long>("dev", 0);
unsigned long cla = policy.attribute_value<unsigned long>("class", 0); unsigned long cla = policy.attribute_value<unsigned long>("class", 0);
if (bus && dev) if (bus && dev)
return (bus == d.bus) && (dev == d.dev); return (bus == d.bus) && (dev == d.dev);
if (vendor && product) if (vendor && product)
return (vendor == d.vendor) && (product == d.product); return (vendor == d.vendor) && (product == d.product);
if (cla) if (cla)
return (cla == d.cla) && (d.label() == s._label.last_element()); return (cla == d.cla) && (d.label() == s._label.last_element());
} catch(Session_policy::No_policy_defined) {}
return false; return false;
} }