36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From ed72c7297b3749d4e15258fd8cf70efca34c6667 Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Thu, 14 Aug 2014 01:35:16 +0200
|
|
Subject: [PATCH 97/97] udev: link-config - fix crash due to missing hwaddr
|
|
|
|
Reported by: master.nosferatu@gmail.com
|
|
|
|
(cherry picked from commit eb7040ec50fbfe5aad9eaf305bd442a4a235aba)
|
|
|
|
Resolves: #1126760
|
|
---
|
|
src/udev/net/link-config.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
|
|
index 5a45c53..3cc0471 100644
|
|
--- a/src/udev/net/link-config.c
|
|
+++ b/src/udev/net/link-config.c
|
|
@@ -247,11 +247,12 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi
|
|
link_config *link;
|
|
|
|
LIST_FOREACH(links, link, ctx->links) {
|
|
+ const char* attr_value = udev_device_get_sysattr_value(device, "address");
|
|
|
|
if (net_match_config(link->match_mac, link->match_path, link->match_driver,
|
|
link->match_type, NULL, link->match_host,
|
|
link->match_virt, link->match_kernel, link->match_arch,
|
|
- ether_aton(udev_device_get_sysattr_value(device, "address")),
|
|
+ attr_value ? ether_aton(attr_value) : NULL,
|
|
udev_device_get_property_value(device, "ID_PATH"),
|
|
udev_device_get_driver(udev_device_get_parent(device)),
|
|
udev_device_get_property_value(device, "ID_NET_DRIVER"),
|
|
--
|
|
1.8.3.1
|
|
|