From 39f62e28dd768e8cc1dc9c1734f33d05f4e19f88 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 4 Jan 2022 21:07:35 +0100 Subject: [PATCH] device: ignore ndisc signal if device has no ifindex It's not clear how this could happen, but it did: #0 _g_log_abort (breakpoint=1) at gmessages.c:580 #0 0x00007f4e782c5895 in _g_log_abort (breakpoint=1) at gmessages.c:580 #1 0x00007f4e782c6b98 in g_logv (log_domain=0x558436ef1520 "nm", log_level=G_LOG_LEVEL_CRITICAL, format=, args=args@entry=0x7ffd5b20b0c0) at gmessages.c:1391 #2 0x00007f4e782c6d63 in g_log (log_domain=log_domain@entry=0x558436ef1520 "nm", log_level=log_level@entry=G_LOG_LEVEL_CRITICAL, format=format@entry=0x7f4e78313620 "%s: assertion '%s' failed") at gmessages.c:1432 #3 0x00007f4e782c759d in g_return_if_fail_warning (log_domain=log_domain@entry=0x558436ef1520 "nm", pretty_function=pretty_function@entry=0x558436e49820 <__func__.43636> "nm_ip6_config_reset_addresses_ndisc", expression=expression@entry=0x558436e48b00 "priv->ifindex > 0") at gmessages.c:2809 #4 0x0000558436bc47ca in nm_ip6_config_reset_addresses_ndisc (self=0x5584385cc190 [NMIP6Config], addresses=0x5584385952a0, addresses_n=1, plen=plen@entry=64 '@', ifa_flags=ifa_flags@entry=768) at src/core/nm-ip6-config.c:1468 #5 0x0000558436d32e50 in ndisc_config_changed (ndisc=, rdata=0x55843856e4d0, changed_int=159, self=0x5584385c00f0 [NMDeviceOvsInterface]) at src/core/devices/nm-device.c:10838 #6 0x00007f4e7323b09e in ffi_call_unix64 () at ../src/x86/unix64.S:76 #7 0x00007f4e7323aa4f in ffi_call (cif=cif@entry=0x7ffd5b20b550, fn=fn@entry=0x558436d32a30 , rvalue=, avalue=avalue@entry=0x7ffd5b20b460) at ../src/x86/ffi64.c:525 #8 0x00007f4e787a0386 in g_cclosure_marshal_generic_va (closure=, return_value=, instance=, args_list=, marshal_data=, n_params=, param_types=) at gclosure.c:1604 #9 0x00007f4e7879f616 in _g_closure_invoke_va (closure=0x55843850b200, return_value=0x0, instance=0x55843856e5d0, args=0x7ffd5b20b800, n_params=2, param_types=0x558438495e50) at gclosure.c:867 #10 0x00007f4e787bba9c in g_signal_emit_valist (instance=0x55843856e5d0, signal_id=, detail=0, var_args=var_args@entry=0x7ffd5b20b800) at gsignal.c:3301 #11 0x00007f4e787bc093 in g_signal_emit (instance=, signal_id=, detail=) at gsignal.c:3448 #12 0x0000558436ddf04b in check_timestamps (ndisc=ndisc@entry=0x55843856e5d0 [NMLndpNDisc], now_msec=now_msec@entry=15132, changed=changed@entry=(NM_NDISC_CONFIG_DHCP_LEVEL | NM_NDISC_CONFIG_GATEWAYS | NM_NDISC_CONFIG_ADDRESSES | NM_NDISC_CONFIG_ROUTES | NM_NDISC_CONFIG_DNS_SERVERS | NM_NDISC_CONFIG_MTU)) at src/core/ndisc/nm-ndisc.c:1539 #13 0x0000558436de08d0 in nm_ndisc_ra_received (ndisc=ndisc@entry=0x55843856e5d0 [NMLndpNDisc], now_msec=now_msec@entry=15132, changed=changed@entry=(NM_NDISC_CONFIG_DHCP_LEVEL | NM_NDISC_CONFIG_GATEWAYS | NM_NDISC_CONFIG_ADDRESSES | NM_NDISC_CONFIG_ROUTES | NM_NDISC_CONFIG_DNS_SERVERS | NM_NDISC_CONFIG_MTU)) at src/core/ndisc/nm-ndisc.c:1556 #14 0x0000558436dd8d50 in receive_ra (ndp=, msg=0x5584385e77c0, user_data=) at src/core/ndisc/nm-lndp-ndisc.c:333 #15 0x00007f4e794718a3 in ndp_call_handlers (msg=0x5584385e77c0, ndp=0x5584384db840) at libndp.c:1993 #16 0x00007f4e794718a3 in ndp_sock_recv (ndp=0x5584384db840) at libndp.c:1871 #17 0x00007f4e794718a3 in ndp_call_eventfd_handler (ndp=ndp@entry=0x5584384db840) at libndp.c:2097 #18 0x00007f4e7947199f in ndp_callall_eventfd_handler (ndp=0x5584384db840) at libndp.c:2126 #19 0x0000558436dda229 in event_ready (fd=, condition=, user_data=) at src/core/ndisc/nm-lndp-ndisc.c:588 #20 0x00007f4e782bf95d in g_main_dispatch (context=0x558438409a40) at gmain.c:3193 #21 0x00007f4e782bf95d in g_main_context_dispatch (context=context@entry=0x558438409a40) at gmain.c:3873 #22 0x00007f4e782bfd18 in g_main_context_iterate (context=0x558438409a40, block=block@entry=1, dispatch=dispatch@entry=1, self=) at gmain.c:3946 #23 0x00007f4e782c0042 in g_main_loop_run (loop=0x5584383e5150) at gmain.c:4142 Above is a stack trace of commit af00e39dd246 ('libnm: add NMIPAddress and NMIPRoute dups backported symbols from 1.30.8'). As workaround, ignore the ndisc signal, if we currently don't have an ifindex. Also, recreate the NMIP6Config instances, if the ifindex doesn't match (or we don't have one). This workaround is probably good enough for the stable branch, as the code on main (1.35+) was heavily reworked and the fix does not apply there. https://bugzilla.redhat.com/show_bug.cgi?id=2013266#c1 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1058 (cherry picked from commit 94215cdb073eb77420d71d11b6a0af0bdda598a7) --- src/core/devices/nm-device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 7bfdf80137..69a5a35623 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -10810,10 +10810,22 @@ ndisc_config_changed(NMNDisc *ndisc, const NMNDiscData *rdata, guint changed_int { NMNDiscConfigMap changed = changed_int; NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self); + int ifindex; guint i; g_return_if_fail(priv->act_request.obj); + ifindex = nm_device_get_ip_ifindex(self); + + if (ifindex <= 0 + || (applied_config_get_current(&priv->ac_ip6_config) + && ifindex + != nm_ip_config_get_ifindex(applied_config_get_current(&priv->ac_ip6_config)))) + applied_config_clear(&priv->ac_ip6_config); + + if (ifindex <= 0) + return; + if (!applied_config_get_current(&priv->ac_ip6_config)) applied_config_init_new(&priv->ac_ip6_config, self, AF_INET6);