Firstly, remove stray assert(). Also be a bit stricter when verifying the
received info. If we get an applicable newlink message that we can't make
sense of, we will now enter NETDEV_FAILED, as we cannot reasonably continue
without knowing the ifindex of our device.
}
int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
}
int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
const char *kind;
char *received_kind;
int r, ifindex;
assert(netdev);
const char *kind;
char *received_kind;
int r, ifindex;
assert(netdev);
- kind = netdev_kind_to_string(netdev->kind);
- if (!kind)
- log_error_netdev(netdev, "Could not get kind");
+ r = sd_rtnl_message_get_type(message, &type);
+ if (r < 0)
+ return r;
+
+ if (type != RTM_NEWLINK)
+ return -EINVAL;
r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
if (r < 0) {
r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
if (r < 0) {
+ kind = netdev_kind_to_string(netdev->kind);
+ if (!kind) {
+ log_error_netdev(netdev, "Could not get kind");
+ netdev_enter_failed(netdev);
+ return -EINVAL;
+ }
+
if (!streq(kind, received_kind)) {
log_error_netdev(netdev, "Received newlink with wrong KIND");
netdev_enter_failed(netdev);
if (!streq(kind, received_kind)) {
log_error_netdev(netdev, "Received newlink with wrong KIND");
netdev_enter_failed(netdev);
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
if (r < 0) {
r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
if (r < 0) {
- log_struct_netdev(LOG_ERR, netdev,
- "MESSAGE=%s: could not get ifindex: %s",
- netdev->name, strerror(-r),
- "ERRNO=%d", -r,
- NULL);
+ log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
+ netdev_enter_failed(netdev);
+ return r;
+ } else if (ifindex <= 0) {
+ log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
+ netdev_enter_failed(netdev);