From f7ca6040616f672a6f0039d55e39c610b7c1cf91 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 4 Jan 2011 18:18:45 -0800 Subject: [PATCH] Fix infinite loop in init when debugging is turned off If a keychord is pressed when debugging is turned off, the main event poll in init will return an event on the keychord fd, but handle_keychord never reads the data. Once this happens, the poll will always return immediately, and init enters an infinite loop. Fix it by always reading from the keychord fd, but only handling the returned keychord if debugging is enabled. Change-Id: Ie4efa98247d3cc978d275dc8a4516b32aa710278 --- init/keychords.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init/keychords.c b/init/keychords.c index 53ab3911..febb62fa 100644 --- a/init/keychords.c +++ b/init/keychords.c @@ -103,14 +103,14 @@ void handle_keychord() // and on user builds for users that are developers. debuggable = property_get("ro.debuggable"); adb_enabled = property_get("init.svc.adbd"); + ret = read(keychord_fd, &id, sizeof(id)); + if (ret != sizeof(id)) { + ERROR("could not read keychord id\n"); + return; + } + if ((debuggable && !strcmp(debuggable, "1")) || (adb_enabled && !strcmp(adb_enabled, "running"))) { - ret = read(keychord_fd, &id, sizeof(id)); - if (ret != sizeof(id)) { - ERROR("could not read keychord id\n"); - return; - } - svc = service_find_by_keychord(id); if (svc) { INFO("starting service %s from keychord\n", svc->name);