SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev-builtin-net_id: do not assume "type" attribute exists

Browse Source 
It *should*, but who knows, let's be more defensive here.

CID #1395805.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-09-25 11:29:54 +02:00
parent ccc0ec6f71
commit 8a76031152
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-builtin-net_id.c
+7 -8
View File
@@ -317,15 +317,14 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
* provide the port number in the 'dev_id' sysfs attribute instead of 'dev_port',
* which thus stays initialized as 0. */
if (dev_port == 0) {
unsigned long type;
attr = udev_device_get_sysattr_value(dev, "type");
/* The 'type' attribute always exists. */
type = strtoul(attr, NULL, 10);
if (type == ARPHRD_INFINIBAND) {
attr = udev_device_get_sysattr_value(dev, "dev_id");
if (attr)
dev_port = strtoul(attr, NULL, 16);
if (attr) {
unsigned long type = strtoul(attr, NULL, 10);
if (type == ARPHRD_INFINIBAND) {
attr = udev_device_get_sysattr_value(dev, "dev_id");
if (attr)
dev_port = strtoul(attr, NULL, 16);
}
}
}
}