From 6fd94b729495d6b9cdb66ae33adafd59f8b38957 Mon Sep 17 00:00:00 2001 From: Grant Erickson Date: Tue, 31 May 2011 22:01:24 +0200 Subject: [PATCH] notifier: Limit Counter Underflow When network and service events occur from the bottom up (e.g. supplicant, link state, etc.) that also incur IP configuration changes, it is possible for one or more of the notifier counters to underflow, leaving connman in a state from which it can never recover without a process restart. By limiting underflow of the three notifier counters, these non- recoverable states are prevented. --- src/notifier.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/notifier.c b/src/notifier.c index 27e53a1..3d83e43 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -241,6 +241,11 @@ void __connman_notifier_unregister(enum connman_service_type type) { DBG("type %d", type); + if (g_atomic_int_get(®istered[type]) == 0) { + connman_error("notifier unregister underflow"); + return; + } + switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: @@ -287,6 +292,11 @@ void __connman_notifier_disable(enum connman_service_type type) { DBG("type %d", type); + if (g_atomic_int_get(&enabled[type]) == 0) { + connman_error("notifier disable underflow"); + return; + } + switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: @@ -333,6 +343,11 @@ void __connman_notifier_disconnect(enum connman_service_type type) { DBG("type %d", type); + if (g_atomic_int_get(&connected[type]) == 0) { + connman_error("notifier disconnect underflow"); + return; + } + switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: -- 2.7.4