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

platform: fix updating object in nmp_cache_update_netlink_route()

Browse source 
_idxcache_update() may remove @entry_old or it may update @entry_old
in-place.

We must assign @out_obj_old before and not touch @entry_old after
_idxcache_update().

Fixes: cdd8c65799
This commit is contained in:
Thomas Haller 2017-08-18 11:30:56 +02:00
parent 75aa3ea194
commit 17f0c19473
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/platform/nmp-object.c
View file

@ -813,8 +813,10 @@ nmp_object_cmp (const NMPObject *obj1, const NMPObject *obj2)
klass1 = NMP_OBJECT_GET_CLASS (obj1); klass1 = NMP_OBJECT_GET_CLASS (obj1);
klass2 = NMP_OBJECT_GET_CLASS (obj2); klass2 = NMP_OBJECT_GET_CLASS (obj2);
if (klass1 != klass2) if (klass1 != klass2) {
nm_assert (klass1->obj_type != klass2->obj_type);
return klass1->obj_type < klass2->obj_type ? -1 : 1; return klass1->obj_type < klass2->obj_type ? -1 : 1;
}
if (klass1->cmd_obj_cmp) if (klass1->cmd_obj_cmp)
return klass1->cmd_obj_cmp (obj1, obj2); return klass1->cmd_obj_cmp (obj1, obj2);
@ -2179,13 +2181,15 @@ nmp_cache_update_netlink_route (NMPCache *cache,
entry_old = _lookup_entry (cache, obj_hand_over); entry_old = _lookup_entry (cache, obj_hand_over);
entry_new = NULL; entry_new = NULL;
NM_SET_OUT (out_obj_old, nmp_object_ref (nm_dedup_multi_entry_get_obj (entry_old)));
if (!entry_old) { if (!entry_old) {
if (!nmp_object_is_alive (obj_hand_over)) if (!nmp_object_is_alive (obj_hand_over))
goto update_done; goto update_done;
_idxcache_update (cache, _idxcache_update (cache,
entry_old, NULL,
obj_hand_over, obj_hand_over,
is_dump, is_dump,
&entry_new); &entry_new);
@ -2215,7 +2219,6 @@ nmp_cache_update_netlink_route (NMPCache *cache,
ops_type = NMP_CACHE_OPS_UPDATED; ops_type = NMP_CACHE_OPS_UPDATED;
update_done: update_done:
NM_SET_OUT (out_obj_old, nmp_object_ref (nm_dedup_multi_entry_get_obj (entry_old)));
NM_SET_OUT (out_obj_new, nmp_object_ref (nm_dedup_multi_entry_get_obj (entry_new))); NM_SET_OUT (out_obj_new, nmp_object_ref (nm_dedup_multi_entry_get_obj (entry_new)));
/* a RTM_GETROUTE event may signal that another object was replaced. /* a RTM_GETROUTE event may signal that another object was replaced.