se: Handle previously enabled secure elements

When seeld terminates but the devices does not reboot, the
secure element may be already up when seeld re-starts.
In that case, do not send an Enabled error, but gracefully fall
back to the right enabled state.

1 files changed, 7 insertions, 1 deletions

diff --git a/se/se.c b/se/se.c
index 1280a3f..4890489 100644
--- a/se/se.c
+++ b/se/se.c
@@ -406,6 +406,9 @@ static DBusMessage *set_property(DBusConnection *conn,
 		err = se_toggle(se, enabled);
 		if (err < 0) {
 			if (err == -EALREADY) {
+				if (se->enabled != enabled)
+					goto ignore_err;
+
 				if (enabled)
 					return __near_error_already_enabled(msg);
 				else
@@ -415,8 +418,11 @@ static DBusMessage *set_property(DBusConnection *conn,
 			return __near_error_failed(msg, -err);
 		}
 
+ignore_err:
 		se->enabled = enabled;
-		g_idle_add(__seel_ace_add, se);
+
+		if (enabled)
+			g_idle_add(__seel_ace_add, se);
 	} else {
 		return __near_error_invalid_property(msg);
 	}