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

platform: fix error handling for creating nlmsg in do_request_all_no_delayed_actions()

Browse source 
In practice, we don't fail to create the nlmsg, because in glib
malloc() cannot fail and we always create large enough buffers.

Anyway, handle the error correctly, and reduce the in-progress
counter again.
This commit is contained in:
Thomas Haller 2019-02-20 14:53:27 +01:00
parent 106e4ebc13
commit a4cff10ceb
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/platform/nm-linux-platform.c
View file

@ -5248,13 +5248,23 @@ do_request_all_no_delayed_actions (NMPlatform *platform, DelayedActionType actio
}; };
nle = nlmsg_append (nlmsg, &gmsg, sizeof (gmsg), NLMSG_ALIGNTO); nle = nlmsg_append (nlmsg, &gmsg, sizeof (gmsg), NLMSG_ALIGNTO);
} }
if (nle < 0)
continue;
if (_nl_send_nlmsg (platform, nlmsg, NULL, NULL, DELAYED_ACTION_RESPONSE_TYPE_REFRESH_ALL_IN_PROGRESS, out_refresh_all_in_progress) < 0) { if (nle < 0)
nm_assert (*out_refresh_all_in_progress > 0); goto next_after_fail;
*out_refresh_all_in_progress -= 1;
} if (_nl_send_nlmsg (platform,
nlmsg,
NULL,
NULL,
DELAYED_ACTION_RESPONSE_TYPE_REFRESH_ALL_IN_PROGRESS,
out_refresh_all_in_progress) < 0)
goto next_after_fail;
continue;
next_after_fail:
nm_assert (*out_refresh_all_in_progress > 0);
*out_refresh_all_in_progress -= 1;
} }
} }