fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-20 07:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: fix assertion failure in device's activate_stage2_device_config()

Browse source 
Fixes: d946aa0c50 ('wired-setting: add support to accept-all-mac-addresses')
This commit is contained in:
Thomas Haller 2021-04-26 18:54:52 +02:00
parent 23a200d19e
commit 43a0c6c111
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/devices/nm-device.c
View file

@ -8502,18 +8502,20 @@ activate_stage2_device_config(NMDevice *self)
accept_all_mac_addresses =
s_wired ? nm_setting_wired_get_accept_all_mac_addresses(s_wired) : NM_TERNARY_DEFAULT;
if (accept_all_mac_addresses != NM_TERNARY_DEFAULT) {
int ifi_flags;
int ifindex = nm_device_get_ip_ifindex(self);
ifi_flags = nm_platform_link_get_ifi_flags(nm_device_get_platform(self),
nm_device_get_ip_ifindex(self),
IFF_PROMISC);
if (ifi_flags >= 0 && ((!!ifi_flags) != (!!accept_all_mac_addresses))) {
nm_platform_link_change_flags(nm_device_get_platform(self),
nm_device_get_ip_ifindex(self),
IFF_PROMISC,
!!accept_all_mac_addresses);
if (priv->promisc_reset == NM_OPTION_BOOL_DEFAULT)
priv->promisc_reset = !accept_all_mac_addresses;
if (ifindex > 0) {
int ifi_flags =
nm_platform_link_get_ifi_flags(nm_device_get_platform(self), ifindex, IFF_PROMISC);
if (ifi_flags >= 0 && ((!!ifi_flags) != (!!accept_all_mac_addresses))) {
nm_platform_link_change_flags(nm_device_get_platform(self),
ifindex,
IFF_PROMISC,
!!accept_all_mac_addresses);
if (priv->promisc_reset == NM_OPTION_BOOL_DEFAULT)
priv->promisc_reset = !accept_all_mac_addresses;
}
}
}