chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network: implement masking of .link, .network and .netdev files
[elogind.git]
/
src
/
udev
/
net
/
link-config.c
diff --git
a/src/udev/net/link-config.c
b/src/udev/net/link-config.c
index 40b1d7f7bc84ceb4316f24c193df8ab0033c314c..345a380d8526ccab5d29c050bcce20040d26c4ae 100644
(file)
--- a/
src/udev/net/link-config.c
+++ b/
src/udev/net/link-config.c
@@
-38,7
+38,7
@@
#include "fileio.h"
#include "hashmap.h"
#include "rtnl-util.h"
#include "fileio.h"
#include "hashmap.h"
#include "rtnl-util.h"
-#include "net
-uti
l.h"
+#include "net
work-interna
l.h"
#include "siphash24.h"
struct link_config_ctx {
#include "siphash24.h"
struct link_config_ctx {
@@
-127,8
+127,7
@@
void link_config_ctx_free(link_config_ctx *ctx) {
if (!ctx)
return;
if (!ctx)
return;
- if (ctx->ethtool_fd >= 0)
- close_nointr_nofail(ctx->ethtool_fd);
+ safe_close(ctx->ethtool_fd);
sd_rtnl_unref(ctx->rtnl);
sd_rtnl_unref(ctx->rtnl);
@@
-140,26
+139,29
@@
void link_config_ctx_free(link_config_ctx *ctx) {
}
static int load_link(link_config_ctx *ctx, const char *filename) {
}
static int load_link(link_config_ctx *ctx, const char *filename) {
-
link_config *link
;
+
_cleanup_free_ link_config *link = NULL
;
_cleanup_fclose_ FILE *file;
int r;
assert(ctx);
assert(filename);
_cleanup_fclose_ FILE *file;
int r;
assert(ctx);
assert(filename);
+ if (null_or_empty_path(filename)) {
+ log_debug("skipping empty file: %s", filename);
+ return 0;
+ }
+
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
return 0;
else
file = fopen(filename, "re");
if (!file) {
if (errno == ENOENT)
return 0;
else
- return errno;
+ return
-
errno;
}
link = new0(link_config, 1);
}
link = new0(link_config, 1);
- if (!link) {
- r = log_oom();
- goto failure;
- }
+ if (!link)
+ return log_oom();
link->mac_policy = _MACPOLICY_INVALID;
link->wol = _WOL_INVALID;
link->mac_policy = _MACPOLICY_INVALID;
link->wol = _WOL_INVALID;
@@
-169,19
+171,16
@@
static int load_link(link_config_ctx *ctx, const char *filename) {
(void*) link_config_gperf_lookup, false, false, link);
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
(void*) link_config_gperf_lookup, false, false, link);
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
-
goto failure
;
+
return r
;
} else
log_debug("Parsed configuration file %s", filename);
link->filename = strdup(filename);
LIST_PREPEND(links, ctx->links, link);
} else
log_debug("Parsed configuration file %s", filename);
link->filename = strdup(filename);
LIST_PREPEND(links, ctx->links, link);
+ link = NULL;
return 0;
return 0;
-
-failure:
- free(link);
- return r;
}
static bool enable_name_policy(void) {
}
static bool enable_name_policy(void) {
@@
-244,9
+243,10
@@
int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi
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,
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,
-
udev_device_get_sysattr_value(device, "address"
),
+
ether_aton(udev_device_get_sysattr_value(device, "address")
),
udev_device_get_property_value(device, "ID_PATH"),
udev_device_get_driver(udev_device_get_parent(device)),
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"),
udev_device_get_devtype(device),
NULL)) {
log_debug("Config file %s applies to device %s",
udev_device_get_devtype(device),
NULL)) {
log_debug("Config file %s applies to device %s",
@@
-294,44
+294,17
@@
static bool mac_is_permanent(struct udev_device *device) {
return type == 0;
}
return type == 0;
}
-#define HASH_KEY SD_ID128_MAKE(d3,1e,48,fa,90,fe,4b,4c,9d,af,d5,d7,a1,b1,2e,8a)
-
static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) {
int r;
if (want_random)
random_bytes(mac->ether_addr_octet, ETH_ALEN);
else {
static int get_mac(struct udev_device *device, bool want_random, struct ether_addr *mac) {
int r;
if (want_random)
random_bytes(mac->ether_addr_octet, ETH_ALEN);
else {
- const char *name;
uint8_t result[8];
uint8_t result[8];
- size_t l, sz;
- uint8_t *v;
-
- /* fetch some persistent data unique (on this machine) to this device */
- name = udev_device_get_property_value(device, "ID_NET_NAME_ONBOARD");
- if (!name) {
- name = udev_device_get_property_value(device, "ID_NET_NAME_SLOT");
- if (!name) {
- name = udev_device_get_property_value(device, "ID_NET_NAME_PATH");
- if (!name)
- return -ENOENT;
- }
- }
- l = strlen(name);
- sz = sizeof(sd_id128_t) + l;
- v = alloca(sz);
-
- /* fetch some persistent data unique to this machine */
- r = sd_id128_get_machine((sd_id128_t*) v);
+ r = net_get_unique_predictable_data(device, result);
if (r < 0)
return r;
if (r < 0)
return r;
- memcpy(v + sizeof(sd_id128_t), name, l);
-
- /* Let's hash the machine ID plus the device name. We
- * use a fixed, but originally randomly created hash
- * key here. */
- siphash24(result, v, sz, HASH_KEY.bytes);
assert_cc(ETH_ALEN <= sizeof(result));
memcpy(mac->ether_addr_octet, result, ETH_ALEN);
assert_cc(ETH_ALEN <= sizeof(result));
memcpy(mac->ether_addr_octet, result, ETH_ALEN);
@@
-364,10
+337,11
@@
int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
if (!old_name)
return -EINVAL;
if (!old_name)
return -EINVAL;
- r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed, config->duplex);
+ r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed
/ 1024
, config->duplex);
if (r < 0)
if (r < 0)
- log_warning("Could not set speed or duplex of %s to %u Mbytes (%s): %s",
- old_name, config->speed, duplex_to_string(config->duplex), strerror(-r));
+ log_warning("Could not set speed or duplex of %s to %u Mbps (%s): %s",
+ old_name, config->speed / 1024, duplex_to_string(config->duplex),
+ strerror(-r));
r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol);
if (r < 0)
r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol);
if (r < 0)
@@
-464,7
+438,7
@@
int link_get_driver(link_config_ctx *ctx, struct udev_device *device, char **ret
return 0;
}
return 0;
}
-static const char* const mac_policy_table[] = {
+static const char* const mac_policy_table[
_MACPOLICY_MAX
] = {
[MACPOLICY_PERSISTENT] = "persistent",
[MACPOLICY_RANDOM] = "random"
};
[MACPOLICY_PERSISTENT] = "persistent",
[MACPOLICY_RANDOM] = "random"
};
@@
-472,7
+446,7
@@
static const char* const mac_policy_table[] = {
DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);
DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy");
DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);
DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy");
-static const char* const name_policy_table[] = {
+static const char* const name_policy_table[
_NAMEPOLICY_MAX
] = {
[NAMEPOLICY_DATABASE] = "database",
[NAMEPOLICY_ONBOARD] = "onboard",
[NAMEPOLICY_SLOT] = "slot",
[NAMEPOLICY_DATABASE] = "database",
[NAMEPOLICY_ONBOARD] = "onboard",
[NAMEPOLICY_SLOT] = "slot",