Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 06:29:23 +01:00
Code Releases Activity

wired: check return of modify_membership

Browse Source 
This could fail and was not being checked. It was minimally changed to
take the ifindex directly (this was the only thing needed from the ethdev)
which allows checking prior to initializing the ethdev.
This commit is contained in:
James Prestwood 2022-03-18 09:44:19 -07:00 committed by Denis Kenzior
parent 78301ec9cb
commit 34ba0d7d4a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wired/ethdev.c
View File

@ -391,7 +391,7 @@ static char *read_devtype_from_uevent(const char *ifname)
return devtype; return devtype;
} }
static int modify_membership(struct ethdev *dev, int optname) static int modify_membership(uint32_t index, int optname)
{ {
struct packet_mreq mreq; struct packet_mreq mreq;
int fd; int fd;
@ -401,7 +401,7 @@ static int modify_membership(struct ethdev *dev, int optname)
return -1; return -1;
memset(&mreq, 0, sizeof(mreq)); memset(&mreq, 0, sizeof(mreq));
mreq.mr_ifindex = dev->index; mreq.mr_ifindex = index;
mreq.mr_type = PACKET_MR_MULTICAST; mreq.mr_type = PACKET_MR_MULTICAST;
mreq.mr_alen = ETH_ALEN; mreq.mr_alen = ETH_ALEN;
memcpy(mreq.mr_address, pae_group_addr, ETH_ALEN); memcpy(mreq.mr_address, pae_group_addr, ETH_ALEN);
@ -415,7 +415,8 @@ static void ethdev_free(void *data)
l_debug("Freeing device %s", dev->ifname); l_debug("Freeing device %s", dev->ifname);
modify_membership(dev, PACKET_DROP_MEMBERSHIP); if (modify_membership(dev->index, PACKET_DROP_MEMBERSHIP) < 0)
l_error("Failed to drop membership");
l_queue_destroy(dev->eapol_sessions, eapol_free); l_queue_destroy(dev->eapol_sessions, eapol_free);
@ -521,6 +522,11 @@ static void newlink_notify(const struct ifinfomsg *ifi, int bytes)
} }
} }
if (modify_membership(index, PACKET_ADD_MEMBERSHIP) < 0) {
l_error("Failed to add membership");
return;
}
dev = l_new(struct ethdev, 1); dev = l_new(struct ethdev, 1);
dev->index = index; dev->index = index;
dev->active = active; dev->active = active;
@ -532,8 +538,6 @@ static void newlink_notify(const struct ifinfomsg *ifi, int bytes)
l_debug("Creating device %u", dev->index); l_debug("Creating device %u", dev->index);
modify_membership(dev, PACKET_ADD_MEMBERSHIP);
l_dbus_object_add_interface(dbus_app_get(), dev->path, l_dbus_object_add_interface(dbus_app_get(), dev->path,
ADAPTER_INTERFACE, dev); ADAPTER_INTERFACE, dev);