summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-10-06 15:48:15 +0200
committerLennart Poettering <lennart@poettering.net>2016-10-06 19:04:01 +0200
commit429b43502675550ed61d3f62a4ffd295ab10732d (patch)
treebbbe9e1f7f9573bf14b6508a31c27a1307d59f7c /src/udev
parentd21494ea25a5f36af998191a7d86adc2fe511638 (diff)
sd-device/networkd: unify code to get a socket for issuing netdev ioctls on
As suggested here: https://github.com/systemd/systemd/pull/4296#issuecomment-251911349 Let's try AF_INET first as socket, but let's fall back to AF_NETLINK, so that we can use a protocol-independent socket here if possible. This has the benefit that our code will still work even if AF_INET/AF_INET6 is made unavailable (for exmple via seccomp), at least on current kernels.
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/net/ethtool-util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index b1aa0223fd..708a665576 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -25,6 +25,7 @@
#include "conf-parser.h"
#include "ethtool-util.h"
#include "log.h"
+#include "socket-util.h"
#include "string-table.h"
#include "strxcpyx.h"
#include "util.h"
@@ -59,10 +60,9 @@ int ethtool_connect(int *ret) {
assert_return(ret, -EINVAL);
- fd = socket(PF_INET, SOCK_DGRAM, 0);
+ fd = socket_ioctl_fd();
if (fd < 0)
- return -errno;
-
+ return fd;
*ret = fd;
return 0;