Close the property socket *after* updating properties.
Also remove some dead code.
Bionic update is in change I3e80cecf
Bug: 4185486
Change-Id: I28e06197ff7a452c70b89b9fc5e2bcf0d9d54bbe
diff --git a/init/property_service.c b/init/property_service.c
index be56a19..7fc4f65 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -189,15 +189,6 @@
__futex_wake(&pi->serial, INT32_MAX);
}
-static int property_write(prop_info *pi, const char *value)
-{
- int valuelen = strlen(value);
- if(valuelen >= PROP_VALUE_MAX) return -1;
- update_prop_info(pi, value, valuelen);
- return 0;
-}
-
-
/*
* Checks permissions for starting/stoping system services.
* AID_SYSTEM and AID_ROOT are always allowed.
@@ -384,8 +375,8 @@
}
r = recv(s, &msg, sizeof(msg), 0);
- close(s);
if(r != sizeof(prop_msg)) {
+ close(s);
ERROR("sys_prop: mis-match msg size recieved: %d expected: %d\n",
r, sizeof(prop_msg));
return;
@@ -416,6 +407,11 @@
default:
break;
}
+
+ // Note: bionic's property client code assumes that the property
+ // server will not close the socket until *AFTER* the property is
+ // written to memory.
+ close(s);
}
void get_property_workspace(int *fd, int *sz)