fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 12:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndisc: abort handling IO in event_ready() if we are unable to switch namespace

Browse source 
It should never happen that we are unable to switch the namespace.
However, in case it does, we cannot just return G_SOURCE_CONTINUE,
because we will just endlessly trying to process IO without actually
reading from the socket.

This shouldn't happen, but the instance is hosed and something is
very wrong. No longer handle the socket to avoid an endless loop.

(cherry picked from commit d444fcde34)
(cherry picked from commit 6631debaa3)
(cherry picked from commit 5c56404dfc)
This commit is contained in:
Thomas Haller 2018-10-03 15:44:36 +02:00
parent 9a06bb2b7b
commit ba6490e00e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ndisc/nm-lndp-ndisc.c
View file

@ -497,8 +497,11 @@ event_ready (GIOChannel *source, GIOCondition condition, NMNDisc *ndisc)
_LOGD ("processing libndp events");
if (!nm_ndisc_netns_push (ndisc, &netns))
return G_SOURCE_CONTINUE;
if (!nm_ndisc_netns_push (ndisc, &netns)) {
/* something is very wrong. Stop handling events. */
priv->event_id = 0;
return G_SOURCE_REMOVE;
}
ndp_callall_eventfd_handler (priv->ndp);
return G_SOURCE_CONTINUE;